diff options
-rwxr-xr-x | configure | 3 | ||||
-rwxr-xr-x | configure.in | 6 |
2 files changed, 3 insertions, 6 deletions
@@ -5621,7 +5621,7 @@ done - vars="-I. -I\"`${CYGPATH} ${srcdir}/generic`\" -I/usr/X11/include/freetype2" + vars="-I. -I\"`${CYGPATH} ${srcdir}/generic`\"" for i in $vars; do PKG_INCLUDES="$PKG_INCLUDES $i" done @@ -9399,6 +9399,7 @@ $as_echo "$enable_xft" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_xft" >&5 $as_echo "$found_xft" >&6; } if test "$found_xft" = "yes" ; then + echo "$XFT_CFLAGS" tk_oldCFlags=$CFLAGS CFLAGS="$XINCLUDES $XFT_CFLAGS" tk_oldLibs=$LIBS diff --git a/configure.in b/configure.in index 94c7b44..41fad06 100755 --- a/configure.in +++ b/configure.in @@ -115,7 +115,7 @@ TEA_ADD_SOURCES([ bltWindow.c ]) TEA_ADD_HEADERS([generic/bltVector.h]) -TEA_ADD_INCLUDES([-I. -I\"`${CYGPATH} ${srcdir}/generic`\" -I/usr/X11/include/freetype2]) +TEA_ADD_INCLUDES([-I. -I\"`${CYGPATH} ${srcdir}/generic`\"]) TEA_ADD_LIBS([]) TEA_ADD_CFLAGS([-Wunused]) TEA_ADD_STUB_SOURCES([]) @@ -277,14 +277,10 @@ SC_PATH_X 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)?]) - else - UNIX_FONT_OBJS=tkUnixFont.o fi AC_SUBST(XFT_CFLAGS) AC_SUBST(XFT_LIBS) - AC_SUBST(UNIX_FONT_OBJS) #fi #-------------------------------------------------------------------- |