--- WindowMaker-0.80.1/WINGs/Examples/Makefile.am.xft2	2002-11-07 17:03:31 +0300
+++ WindowMaker-0.80.1/WINGs/Examples/Makefile.am	2002-11-07 17:03:31 +0300
@@ -26,6 +26,6 @@
 
 
 INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
-	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
+	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DDEBUG
 
 
--- WindowMaker-0.80.1/WINGs/Extras/Makefile.am.xft2	2002-11-07 17:03:31 +0300
+++ WindowMaker-0.80.1/WINGs/Extras/Makefile.am	2002-11-07 17:03:31 +0300
@@ -24,7 +24,7 @@
 
 
 INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
-	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
+	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DDEBUG
 
 LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
 	@XFTLIBS@ @INTLIBS@
--- WindowMaker-0.80.1/WINGs/Tests/Makefile.am.xft2	2002-11-07 17:03:31 +0300
+++ WindowMaker-0.80.1/WINGs/Tests/Makefile.am	2002-11-07 17:03:31 +0300
@@ -16,6 +16,6 @@
 EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
 
 INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
-	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
+	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DDEBUG
 
 
--- WindowMaker-0.80.1/WINGs/Makefile.am.xft2	2001-10-03 13:01:41 +0400
+++ WindowMaker-0.80.1/WINGs/Makefile.am	2002-11-07 17:03:31 +0300
@@ -108,7 +108,7 @@
 CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
 
 INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
-	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
+	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DDEBUG
 
 
 wcolorpanel.o: wcolorpanel.c
--- WindowMaker-0.80.1/src/Makefile.am.xft2	2002-11-07 17:03:31 +0300
+++ WindowMaker-0.80.1/src/Makefile.am	2002-11-07 17:03:31 +0300
@@ -109,7 +109,7 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/wrlib \
-	-I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
+	-I$(top_srcdir)/WINGs @XFTFLAGS@ @HEADER_SEARCH_PATH@ 
 
 
 wmaker_LDADD = \
--- WindowMaker-0.80.1/util/Makefile.am.xft2	2002-11-07 17:03:31 +0300
+++ WindowMaker-0.80.1/util/Makefile.am	2002-11-07 17:03:31 +0300
@@ -12,8 +12,9 @@
 		wkdemenu.pl wmchlocale.in wcopy wpaste
 
 INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
-	@HEADER_SEARCH_PATH@ \
+	@XFTFLAGS@ @HEADER_SEARCH_PATH@ \
 	-DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
+	
 
 liblist= @LIBRARY_SEARCH_PATH@ @INTLIBS@
 
--- WindowMaker-0.80.1/WPrefs.app/Makefile.am.xft2	2002-11-07 17:03:31 +0300
+++ WindowMaker-0.80.1/WPrefs.app/Makefile.am	2002-11-07 17:03:31 +0300
@@ -44,7 +44,7 @@
 
 CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
 
-INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
+INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @XFTFLAGS@ @HEADER_SEARCH_PATH@ 
 
 WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
 
--- WindowMaker-0.80.1/configure.ac.xft2	2002-11-07 17:03:31 +0300
+++ WindowMaker-0.80.1/configure.ac	2002-11-07 22:26:12 +0300
@@ -512,15 +512,26 @@
 dnl ============================
 xft=yes
 XFTLIBS=""
+XFTFLAGS=""
 AC_ARG_ENABLE(xft, 
 [  --disable-xft           disable Xft antialiased font support],
 		xft=$enableval, xft=yes)
 
 if test "$xft" = yes; then
-	AC_CHECK_LIB(Xft, XftDrawCreate, [XFTLIBS="-lXft"
+	AC_CHECK_LIB(Xft2, XftDrawCreate, [XFTLIBS=`xft-config --libs`
+	        XFTFLAGS=`xft-config --cflags`
 		AC_SUBST(XFTLIBS)
+		AC_SUBST(XFTFLAGS)
 		AC_DEFINE(XFT, 1, [define if you want support for antialiased fonts (set by configure)])],
 		xft=no, $XLFLAGS $XLIBS)
+
+	if test "$xft" = no; then
+		xft=yes
+		AC_CHECK_LIB(Xft, XftDrawCreate, [XFTLIBS="-lXft"
+			AC_SUBST(XFTLIBS)
+			AC_DEFINE(XFT, 1, [define if you want support for antialiased fonts (set by configure)])],
+			xft=no, $XLFLAGS $XLIBS)
+	fi
 fi