--- configure	2006-04-17 13:22:36.000000000 -0500
+++ configure.new	2006-10-09 14:19:21.000000000 -0500
@@ -4915,18 +4915,18 @@
   if test x$xft_config_exec_prefix != x ; then
      xft_config_args="$xft_config_args --exec-prefix=$xft_config_exec_prefix"
      if test x${XFT_CONFIG+set} != xset ; then
-       XFT_CONFIG=$xft_config_exec_prefix/bin/xft-config
+       XFT_CONFIG=$xft_config_exec_prefix/bin/pkg-config xft --cflags
      fi
   fi
   if test x$xft_config_prefix != x ; then
      xft_config_args="$xft_config_args --prefix=$xft_config_prefix"
      if test x${XFT_CONFIG+set} != xset ; then
-       XFT_CONFIG=$xft_config_prefix/bin/xft-config
+       XFT_CONFIG=$xft_config_prefix/bin/pkg-config xft --cflags
      fi
   fi
 
-  # Extract the first word of "xft-config", so it can be a program name with args.
-set dummy xft-config; ac_word=$2
+  # Extract the first word of "pkg-config xft --cflags", so it can be a program name with args.
+set dummy pkg-config xft --cflags; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XFT_CONFIG+set}" = set; then
@@ -5013,10 +5013,10 @@
           echo    ".$xft_wanted_micro_version."
           echo "***"
           echo "*** If you have already installed a sufficiently new version, this error"
-          echo "*** probably means that the wrong copy of the xft-config shell script is"
+          echo "*** probably means that the wrong copy of the pkg-config xft --cflags shell script is"
           echo "*** being found. The easiest way to fix this is to remove the old version"
           echo "*** of xft, but you can also set the XFT_CONFIG environment to point to the"
-          echo "*** correct copy of xft-config. (In this case, you will have to"
+          echo "*** correct copy of pkg-config xft --cflags. (In this case, you will have to"
           echo "*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf"
           echo "*** so that the correct libraries are found at run-time)"
         fi
@@ -5031,8 +5031,8 @@
 #define HAVE_XFT
 _ACEOF
 
-			XFT_LIBS=`xft-config --libs`
-			XFT_CFLAGS=`xft-config --cflags`
+			XFT_LIBS=`pkg-config xft --cflags --libs`
+			XFT_CFLAGS=`pkg-config xft --cflags --cflags`
 			LIBS="$LIBS $XFT_LIBS"
 			CXXFLAGS="$CXXFLAGS $XFT_CFLAGS"
 			FEATURES="$FEATURES Xft";
@@ -5041,10 +5041,10 @@
      echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
      if test "$XFT_CONFIG" = "no" ; then
-       echo "*** The xft-config script installed by xft could not be found"
+       echo "*** The pkg-config xft --cflags script installed by xft could not be found"
        echo "*** If xft was installed in PREFIX, make sure PREFIX/bin is in"
        echo "*** your path, or set the XFT_CONFIG environment variable to the"
-       echo "*** full path to xft-config."
+       echo "*** full path to pkg-config xft --cflags."
      fi
      XFT_CFLAGS=""
      XFT_LIBS=""