summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rwxr-xr-xunix/configure31
-rw-r--r--unix/configure.in30
3 files changed, 43 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index 920b945..0d25bc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-08 Kevin Kenny <kennykb@acm.org>
+
+ * unix/configure.in: Silenced warnings about missing Xft
+ configuration unless --enable-xft is requested explicitly.
+ * unix/configure: Regen.
+
2006-11-07 Kevin Kenny <kennykb@acm.org>
* unix/configure.in: Made --enable-xft the default.
diff --git a/unix/configure b/unix/configure
index 1734e67..52d4bcc 100755
--- a/unix/configure
+++ b/unix/configure
@@ -9265,25 +9265,32 @@ if test "${enable_xft+set}" = set; then
enableval="$enable_xft"
enable_xft=$enableval
else
- enable_xft="yes"
+ enable_xft="default"
fi;
XFT_CFLAGS=""
XFT_LIBS=""
- 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"
+ if test "$enable_xft" == "no" ; then
+ echo "$as_me:$LINENO: result: $enable_xft" >&5
+echo "${ECHO_T}$enable_xft" >&6
+ else
+ found_xft="yes"
+ XFT_CFLAGS=`xft-config --cflags 2>/dev/null` || found_xft="no"
+ XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
+ if test "$found_xft" = "no" ; then
+ found_xft=yes
+ XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
+ XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
fi
- if test "$enable_xft" = "no" ; then
- { echo "$as_me:$LINENO: WARNING: Can't find xft configuration" >&5
+ echo "$as_me:$LINENO: result: $found_xft" >&5
+echo "${ECHO_T}$found_xft" >&6
+ if test "$found_xft" = "no" ; then
+ if test "$enable_xft" = "yes" ; then
+ { echo "$as_me:$LINENO: WARNING: Can't find xft configuration" >&5
echo "$as_me: WARNING: Can't find xft configuration" >&2;}
+ fi
+ enable_xft=no
fi
fi
- echo "$as_me:$LINENO: result: $enable_xft" >&5
-echo "${ECHO_T}$enable_xft" >&6
if test $enable_xft = "yes" ; then
UNIX_FONT_OBJS=tkUnixRFont.o
diff --git a/unix/configure.in b/unix/configure.in
index 5d16b0b..3d741e4 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.124 2006/11/08 15:19:51 dgp Exp $
+# RCS: @(#) $Id: configure.in,v 1.125 2006/11/08 15:39:29 kennykb Exp $
AC_INIT([tk],[8.5])
AC_PREREQ(2.59)
@@ -425,22 +425,28 @@ if test $tk_aqua = no; then
AC_ARG_ENABLE(xft,
AC_HELP_STRING([--enable-xft],
[use freetype/fontconfig/xft (default: on)]),
- [enable_xft=$enableval], [enable_xft="yes"])
+ [enable_xft=$enableval], [enable_xft="default"])
XFT_CFLAGS=""
XFT_LIBS=""
- 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"
+ if test "$enable_xft" == "no" ; then
+ AC_MSG_RESULT([$enable_xft])
+ else
+ found_xft="yes"
+ XFT_CFLAGS=`xft-config --cflags 2>/dev/null` || found_xft="no"
+ XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
+ if test "$found_xft" = "no" ; then
+ found_xft=yes
+ XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
+ XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
fi
- if test "$enable_xft" = "no" ; then
- AC_MSG_WARN([Can't find xft configuration])
+ AC_MSG_RESULT([$found_xft])
+ if test "$found_xft" = "no" ; then
+ if test "$enable_xft" = "yes" ; then
+ AC_MSG_WARN([Can't find xft configuration])
+ fi
+ enable_xft=no
fi
fi
- AC_MSG_RESULT([$enable_xft])
if test $enable_xft = "yes" ; then
UNIX_FONT_OBJS=tkUnixRFont.o
AC_DEFINE(HAVE_XFT, 1, [Have we turned on XFT (antialiased fonts)?])