Corrected Xft configuration so that Xft

actually does get turned on if available

3 files changed, 11 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 7171d7e..06e07ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-27  Kevin Kenny  <kennykb@acm.org>
+
+	* unix/configure.in: Corrected Xft configuration so that Xft
+	actually does get turned on when available.
+	* unix/configure: autoconf
+	
 2006-11-26  Joe English  <jenglish@users.sourceforge.net>
 	* generic/ttk/ttkWidget.c, generic/ttk/ttkPaned.c Fix for #1603506
 	* library/ttk/button.tcl, library/ttk/combobox.tcl,
diff --git a/unix/configure b/unix/configure
index d7d57c5..2ad2e29 100755
--- a/unix/configure
+++ b/unix/configure
@@ -9610,6 +9610,8 @@ fi
 echo "$as_me: WARNING: Can't find xft configuration, or xft is unusable" >&2;}
 	    fi
 	    enable_xft=no
+	else
+            enable_xft=yes
 	fi
     fi
     if test $enable_xft = "yes" ; then
diff --git a/unix/configure.in b/unix/configure.in
index 4117c42..5d8320f 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tk installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.128 2006/11/26 06:02:56 das Exp $
+# RCS: @(#) $Id: configure.in,v 1.129 2006/11/27 19:08:56 kennykb Exp $
 
 AC_INIT([tk],[8.5])
 AC_PREREQ(2.59)
@@ -472,6 +472,8 @@ if test $tk_aqua = no; then
 		AC_MSG_WARN([Can't find xft configuration, or xft is unusable])
 	    fi
 	    enable_xft=no
+	else
+            enable_xft=yes
 	fi
     fi
     if test $enable_xft = "yes" ; then