--- rxvt-unicode/configure.ac	2006/01/21 19:50:53	1.16
+++ rxvt-unicode/configure.ac	2006/01/21 22:32:29	1.18
@@ -50,12 +50,12 @@
       [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }])],
       [AC_MSG_RESULT(ok)],
       [
-         AC_MSG_RESULT([no, make everything bigger and slower])
-         CXX="$save_CXX"
+         AC_MSG_RESULT([no, making everything bigger and slower])
          LIBS="$save_LIBS"
-         LINKER="$CXX"
+         LINKER="$save_CXX"
       ]
    )
+   CXX="$save_CXX"
 fi
 AC_SUBST(LINKER,[$LINKER])
 
@@ -842,8 +842,17 @@
 dnl# now add and remove other stuff
 dnl# --------------------------------------------------------------------------
 if test x$support_xft = xyes; then
-  LIBS="$LIBS `pkg-config xft --libs`"
-  CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
+  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  AC_PATH_PROG(XFT_CONFIG, xft-config, no)
+  if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
+    LIBS="$LIBS `$PKG_CONFIG xft --libs`"
+    CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
+  else
+    if test $XFT_CONFIG != no; then
+      LIBS="$LIBS `$XFT_CONFIG --libs`"
+      CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
+    fi
+  fi
 
   AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
   AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])