summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2005-05-07 00:35:39 (GMT)
committerhobbs <hobbs>2005-05-07 00:35:39 (GMT)
commit99402b0b6312e1c1cd6c8e74b47cb65489e7625a (patch)
treef63e82d3449864e5b5b7507161f3679dc27a2db0
parent7c1ded63bed472840c34fd71f6d4e144b62ae453 (diff)
downloadtk-99402b0b6312e1c1cd6c8e74b47cb65489e7625a.zip
tk-99402b0b6312e1c1cd6c8e74b47cb65489e7625a.tar.gz
tk-99402b0b6312e1c1cd6c8e74b47cb65489e7625a.tar.bz2
fixed pkg-config xft check, needed reset of enable_xft first
-rwxr-xr-xunix/configure1
-rw-r--r--unix/configure.in3
2 files changed, 3 insertions, 1 deletions
diff --git a/unix/configure b/unix/configure
index 9c770dd..406d06c 100755
--- a/unix/configure
+++ b/unix/configure
@@ -8824,6 +8824,7 @@ echo $ECHO_N "checking for xft configuration... $ECHO_C" >&6
XFT_CFLAGS=`xft-config --cflags 2>/dev/null` || enable_xft="no"
XFT_LIBS=`xft-config --libs 2>/dev/null` || enable_xft="no"
if test "$enable_xft" = "no" ; then
+ enable_xft=yes
XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || enable_xft="no"
XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || enable_xft="no"
fi
diff --git a/unix/configure.in b/unix/configure.in
index 6b9f99e..e9d1c63 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.100 2005/05/07 00:28:17 hobbs Exp $
+# RCS: @(#) $Id: configure.in,v 1.101 2005/05/07 00:35:40 hobbs Exp $
AC_INIT([tk],[8.5])
AC_PREREQ(2.57)
@@ -304,6 +304,7 @@ if test "$enable_xft" = "yes" ; then
XFT_CFLAGS=`xft-config --cflags 2>/dev/null` || enable_xft="no"
XFT_LIBS=`xft-config --libs 2>/dev/null` || enable_xft="no"
if test "$enable_xft" = "no" ; then
+ enable_xft=yes
XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || enable_xft="no"
XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || enable_xft="no"
fi