From c27d13b7de0c02deb53ec68d45a8ef58941c6c15 Mon Sep 17 00:00:00 2001
From: jacob berkman <jacob@ximian.com>
Date: Wed, 24 Jul 2002 13:27:35 +0000
Subject: [PATCH] only #define HAVE_XFT2 if we actually have xft2

2002-07-24  jacob berkman  <jacob@ximian.com>

	* configure.in: only #define HAVE_XFT2 if we actually have xft2
---
 ChangeLog    | 2 ++
 configure.in | 7 ++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a22bd8bc8..69a7c7ca9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-07-24  jacob berkman  <jacob@ximian.com>
 
+	* configure.in: only #define HAVE_XFT2 if we actually have xft2
+
 	* configure.in: fixup x11 checks when x11 include path is not in
 	the default include path for the compiler
 
diff --git a/configure.in b/configure.in
index 3d5304e90..01924a665 100644
--- a/configure.in
+++ b/configure.in
@@ -64,15 +64,12 @@ dnl
 dnl Check for Xft version 2; we build in extra functionality to the font capplet
 dnl when we have it.
 dnl
-have_xft2=false
-xft_modules=""
+xft_modules=
 if $PKG_CONFIG --exists xft ; then
-  have_xft2=true
   xft_modules="xft"
+  AC_DEFINE(HAVE_XFT2)
 fi
 
-AC_DEFINE(HAVE_XFT2)
-
 PKG_CHECK_MODULES(FONT_CAPPLET, $COMMON_MODULES $xft_modules)
 
 CAPPLET_LIBS="$CAPPLET_LIBS $x_libs"