build fix: use 'xft-config' instead of 'pkg-config' to use the right libs

when linking with binutils-gold and --no-add-needed it is not enough to
just use -lXft but it must be -lXft -fontconfig (and some more). since we
use 'pkg-config --libs' to find out about the needed flags and 'pkg-config'
only returns -lXft (except by using

   pkg-config --libs `pkg-config --print-requires-private xft`

) we switched to 'xft-config --libs' which gives us the complete list of
all needed libs.

the issue was brought to attention by

   http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554386

but the proposed fix was just quick and dirty.

1 files changed, 20 insertions, 20 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index a181dba..0b53558 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -168,28 +168,28 @@ AC_DEFUN([AM_PATH_XFT1],
 # AM_PATH_XFT2([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 AC_DEFUN([AM_PATH_XFT2],
 [
-        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
+    if test x$pkg_exec_prefix != x ; then
+        xft_args="$xft_args --exec-prefix=$pkg_exec_prefix"
+        if test x${XFT_CONFIG+set} != xset ; then
+            XFT_CONFIG=$pkg_exec_prefix/bin/xft-config
+        fi
     fi
-fi
 
-if test x$xft_prefix != x ; then
-   xft_args="$xft_args --prefix=$xft_prefix"
-   if test x${PKG_CONFIG+set} != xset ; then
-      PKG_CONFIG=$xft_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
+       fi
+    fi
 
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test "x$PKG_CONFIG" = "xno" ; then
-        ifelse([$2], , :, [$2])
-else 
-        XFT_CFLAGS=`$PKG_CONFIG $xftconf_args --cflags xft`
-        XFT_LIBS=`$PKG_CONFIG $xftconf_args --libs xft`
-        ifelse([$1], , :, [$1])
-fi
+    AC_PATH_PROG(XFT_CONFIG, xft-config, no)
+    if test "x$XFT_CONFIG" = "xno" ; then
+        ifelse([$2], , :, [$2])
+    else 
+        XFT_CFLAGS=`$XFT_CONFIG $xftconf_args --cflags`
+        XFT_LIBS=`$XFT_CONFIG $xftconf_args --libs`
+        ifelse([$1], , :, [$1])
+    fi
 
 ])
 
@@ -230,4 +230,4 @@ CFLAGS="$CFLAGS $XFT_CFLAGS"
 CXXFLAGS="$CXXFLAGS $XFT_CFLAGS"
 LIBS="$LIBS $XFT_LIBS"
 
-])
+]