From 64468fcf63ed1a37bf289f81ec6589ed7d66246f Mon Sep 17 00:00:00 2001
From: dan <dan>
Date: Tue, 10 Jun 2003 01:56:26 +0000
Subject: [PATCH] support for compiling with xft2

---
 ChangeLog         |  1 +
 WINGs/Makefile.am |  2 +-
 WINGs/widgets.c   |  5 +++++
 configure.ac      | 31 ++++++++++++++++++++++++++-----
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 17adda1d..0fbd8f0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,6 +97,7 @@ Changes since version 0.80.2:
   (Peter Zijlstra <a.p.zijlstra@chello.nl>)
 - Icon arrangement that takes the new extended xinerama 'strut' into account
   (Peter Zijlstra <a.p.zijlstra@chello.nl>)
+- Fixed the 'KDE omnipresent' bug.
 
 
 Changes since version 0.80.1:
diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am
index 49855a81..c0c1a892 100644
--- a/WINGs/Makefile.am
+++ b/WINGs/Makefile.am
@@ -110,7 +110,7 @@ libWUtil_a_SOURCES = 	\
 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
diff --git a/WINGs/widgets.c b/WINGs/widgets.c
index c073b442..a9ddc888 100644
--- a/WINGs/widgets.c
+++ b/WINGs/widgets.c
@@ -629,7 +629,12 @@ WMCreateScreenWithRContext(Display *display, int screen, RContext *context)
     scrPtr->xftFontSetCache = WMCreateHashTable(WMStringPointerHashCallbacks);
 
 #ifdef XFT
+
+# ifdef XFT2
+    scrPtr->hasXftSupport = 1;
+# else
     scrPtr->hasXftSupport = XftDefaultHasRender(scrPtr->display);
+# endif
 
     scrPtr->xftdraw = XftDrawCreate(scrPtr->display, W_DRAWABLE(scrPtr),
                                     scrPtr->visual, scrPtr->colormap);
diff --git a/configure.ac b/configure.ac
index 9f81661d..4a6bff57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -232,9 +232,14 @@ if test "$ac_cv_prog_gcc" = yes; then
 fi
 
 
+dnl pkg-config
+dnl ----------
+dnl AC_ARG_VAR(PKGCONFIG, [pkg-config command])
+AC_CHECK_PROG(PKGCONFIG, pkg-config, pkg-config) 
+
 
 dnl gettext
-dnl =======
+dnl -------
 
 
 dnl AM_GNU_GETTEXT
@@ -517,13 +522,29 @@ AC_ARG_ENABLE(xft,
 		xft=$enableval, xft=yes)
 
 if test "$xft" = yes; then
-	AC_CHECK_LIB(Xft, XftDrawCreate, [XFTLIBS="-lXft"
+	if test "x$PKGCONFIG" != x -a "`$PKGCONFIG xft; echo $?`" = 0; then
+		XFTCONFIG="$PKGCONFIG xft"
+		pkgconfig_xft=yes
+	else
+		AC_CHECK_PROG(XFTCONFIG, xft-config, xft-config)
+	fi
+	if test "x$XFTCONFIG" != x; then
+		XFTLIBS=`$XFTCONFIG --libs`
+		XFTFLAGS=`$XFTCONFIG --cflags`
+		AC_MSG_CHECKING([for the Xft2 library])
+		AC_MSG_RESULT([found])
+		AC_DEFINE(XFT2, 1, [define if you have Xft version 2 (set by configure)])
+	else
+		AC_CHECK_LIB(Xft, XftDrawCreate, [XFTLIBS="-lXft" XFTFLAGS=""],
+			xft=no, $XLFLAGS $XLIBS)
+	fi
+	if test "$xft" = yes; then
+		AC_SUBST(XFTFLAGS)
 		AC_SUBST(XFTLIBS)
-		AC_DEFINE(XFT, 1, [define if you want support for antialiased fonts (set by configure)])],
-		xft=no, $XLFLAGS $XLIBS)
+		AC_DEFINE(XFT, 1, [define if you want support for antialiased fonts (set by configure)])
+	fi
 fi
 
-
 dnl XINERAMA support
 dnl ================
 xinerama=no