M xft.m4 → xft.m4

@@ -32,26 +32,26 @@ 
 # AM_PATH_XFT2([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 AC_DEFUN(AM_PATH_XFT2,
 [
-if test x$xft_exec_prefix != x ; then
-   xft_args="$xft_args --exec-prefix=$xft_exec_prefix"
-   if test x${XFT_CONFIG+set} != xset ; then
-       XFT_CONFIG=$xft_exec_prefix/bin/xft-config
+	if test x$pkg_exec_prefix != x ; then
+	   xft_args="$xft_args --exec-prefix=$pkg_exec_prefix"
+	   if test x${PKG_CONFIG+set} != xset ; then
+	       PKG_CONFIG=$pkg_exec_prefix/bin/pkg-config
     fi
 fi
 
 if test x$xft_prefix != x ; then
    xft_args="$xft_args --prefix=$xft_prefix"
-   if test x${XFT_CONFIG+set} != xset ; then
-      XFT_CONFIG=$xft_prefix/bin/xft-config
+   if test x${PKG_CONFIG+set} != xset ; then
+      PKG_CONFIG=$xft_prefix/bin/pkg-config	  
    fi
 fi
 
-AC_PATH_PROG(XFT_CONFIG, xft-config, no)
-if test "x$XFT_CONFIG" = "xno" ; then
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+if test "x$PKG_CONFIG" = "xno" ; then
 	ifelse([$2], , :, [$2])
 else 
-	XFT_CFLAGS=`$XFT_CONFIG $xftconf_args --cflags`
-	XFT_LIBS=`$XFT_CONFIG $xftconf_args --libs`
+	XFT_CFLAGS=`$PKG_CONFIG $xftconf_args --cflags xft`
+	XFT_LIBS=`$PKG_CONFIG $xftconf_args --libs xft`
 	ifelse([$1], , :, [$1])
 fi
 
@@ -63,8 +63,8 @@ AC_DEFUN(AM_PATH_XFT,
 [
  AC_ARG_WITH(xft-prefix,[  --with-xft-prefix=path  Prefix where Xft is installed (optional)],
             xft_prefix="$withval", xft_prefix="")
- AC_ARG_WITH(xft-exec-prefix,[  --with-xft-exec-prefix=path Exec prefix where xft-config is installed (optional)],
-            xft_exec_prefix="$withval", xft_exec_prefix="")
+ AC_ARG_WITH(pkg-exec-prefix,[  --with-pkg-exec-prefix=path Exec prefix where pkg-config is installed (optional)],
+            pkg_exec_prefix="$withval", pkg_exec_prefix="")
  AC_ARG_ENABLE(xft, [  --enable-xft            Xft (antialias) support (default=$1)],
 	if test "x$enableval" = "xyes"; then
 		TRY_XFT=yes