diff options
| -rw-r--r-- | unix/configure.in | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/unix/configure.in b/unix/configure.in index 0f4906b..4117c42 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.127 2006/11/08 18:40:46 kennykb Exp $ +# RCS: @(#) $Id: configure.in,v 1.128 2006/11/26 06:02:56 das Exp $ AC_INIT([tk],[8.5]) AC_PREREQ(2.59) @@ -423,62 +423,62 @@ fi if test $tk_aqua = no; then AC_MSG_CHECKING([whether to use xft]) AC_ARG_ENABLE(xft, - AC_HELP_STRING([--enable-xft], - [use freetype/fontconfig/xft (default: on)]), - [enable_xft=$enableval], [enable_xft="default"]) + AC_HELP_STRING([--enable-xft], + [use freetype/fontconfig/xft (default: on)]), + [enable_xft=$enableval], [enable_xft="default"]) XFT_CFLAGS="" XFT_LIBS="" if test "$enable_xft" = "no" ; then - AC_MSG_RESULT([$enable_xft]) + AC_MSG_RESULT([$enable_xft]) else - found_xft="yes" + found_xft="yes" dnl make sure package configurator (xft-config or pkg-config dnl says that xft is present. - 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 + 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 AC_MSG_RESULT([$found_xft]) dnl make sure that compiling against Xft header file doesn't bomb - if test "$found_xft" = "yes" ; then + if test "$found_xft" = "yes" ; then tk_oldCFlags=$CFLAGS CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS" tk_oldLibs=$LIBS LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW" AC_CHECK_HEADER(X11/Xft/Xft.h, [], [ - found_xft=no - ],[#include <X11/Xlib.h>]) - CFLAGS=$tk_oldCFlags - LIBS=$tk_oldLibs - fi + found_xft=no + ],[#include <X11/Xlib.h>]) + CFLAGS=$tk_oldCFlags + LIBS=$tk_oldLibs + fi dnl make sure that linking against Xft libraries finds freetype - if test "$found_xft" = "yes" ; then + if test "$found_xft" = "yes" ; then tk_oldCFlags=$CFLAGS CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS" tk_oldLibs=$LIBS LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW" AC_CHECK_LIB(Xft, FT_New_Face, [], [ - found_xft=no - ]) - CFLAGS=$tk_oldCFlags - LIBS=$tk_oldLibs - fi + found_xft=no + ]) + CFLAGS=$tk_oldCFlags + LIBS=$tk_oldLibs + fi dnl print a warning if xft is unusable and was specifically requested - if test "$found_xft" = "no" ; then - if test "$enable_xft" = "yes" ; then - AC_MSG_WARN([Can't find xft configuration, or xft is unusable]) - fi - enable_xft=no - fi + if test "$found_xft" = "no" ; then + if test "$enable_xft" = "yes" ; then + AC_MSG_WARN([Can't find xft configuration, or xft is unusable]) + fi + enable_xft=no + fi fi if test $enable_xft = "yes" ; then - UNIX_FONT_OBJS=tkUnixRFont.o - AC_DEFINE(HAVE_XFT, 1, [Have we turned on XFT (antialiased fonts)?]) + UNIX_FONT_OBJS=tkUnixRFont.o + AC_DEFINE(HAVE_XFT, 1, [Have we turned on XFT (antialiased fonts)?]) else - UNIX_FONT_OBJS=tkUnixFont.o + UNIX_FONT_OBJS=tkUnixFont.o fi AC_SUBST(XFT_CFLAGS) AC_SUBST(XFT_LIBS) |