summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoye <joye>2013-09-11 20:46:40 (GMT)
committerjoye <joye>2013-09-11 20:46:40 (GMT)
commit0eda9cc705acbc6c17ad7eab46e685fcce309d9f (patch)
treee9219bdb6c16dbb52dff923db75f37a30c9400d5
parent2d3335d906b130949a686e22e09b7189b14b3b89 (diff)
downloadblt-0eda9cc705acbc6c17ad7eab46e685fcce309d9f.zip
blt-0eda9cc705acbc6c17ad7eab46e685fcce309d9f.tar.gz
blt-0eda9cc705acbc6c17ad7eab46e685fcce309d9f.tar.bz2
*** empty log message ***
-rwxr-xr-xconfigure3
-rwxr-xr-xconfigure.in6
2 files changed, 3 insertions, 6 deletions
diff --git a/configure b/configure
index 0dfd032..f5fcde9 100755
--- a/configure
+++ b/configure
@@ -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
#--------------------------------------------------------------------