summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoye <joye>2013-09-11 20:46:40 (GMT)
committerjoye <joye>2013-09-11 20:46:40 (GMT)
commit7ebb2ec3a8e19d0a5e4ecf65aad563467747480d (patch)
tree487b2c6c7dbbd4d631b185348feffa6f987076c6
parent0eda9cc705acbc6c17ad7eab46e685fcce309d9f (diff)
downloadblt-7ebb2ec3a8e19d0a5e4ecf65aad563467747480d.zip
blt-7ebb2ec3a8e19d0a5e4ecf65aad563467747480d.tar.gz
blt-7ebb2ec3a8e19d0a5e4ecf65aad563467747480d.tar.bz2
*** empty log message ***
-rwxr-xr-xMakefile.in10
-rwxr-xr-xconfigure10
-rwxr-xr-xconfigure.in4
3 files changed, 9 insertions, 15 deletions
diff --git a/Makefile.in b/Makefile.in
index b9abd63..e4d16a83 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -145,7 +145,7 @@ WISH = $(PKG_ENV) $(TCLSH_ENV) $(WISH_ENV) $(WISH_PROG)
SHARED_BUILD = @SHARED_BUILD@
#INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@
-INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
+INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@ @XFT_CFLAGS@
PKG_CFLAGS = @PKG_CFLAGS@
@@ -201,10 +201,10 @@ libraries:
#========================================================================
doc:
- @echo "If you have documentation to create, place the commands to"
- @echo "build the docs in the 'doc:' target. For example:"
- @echo " xml2nroff sample.xml > sample.n"
- @echo " xml2html sample.xml > sample.html"
+# @echo "If you have documentation to create, place the commands to"
+# @echo "build the docs in the 'doc:' target. For example:"
+# @echo " xml2nroff sample.xml > sample.n"
+# @echo " xml2html sample.xml > sample.html"
install: all install-binaries install-libraries install-doc
diff --git a/configure b/configure
index f5fcde9..9f41066 100755
--- a/configure
+++ b/configure
@@ -621,7 +621,6 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
TCLSH_PROG
-UNIX_FONT_OBJS
XFT_LIBS
XFT_CFLAGS
XMKMF
@@ -9372,7 +9371,7 @@ $as_echo "could not find any! Using -lX11." >&6; }
# Check for freetype / fontconfig / Xft support.
#--------------------------------------------------------------------
-#if test $tk_aqua = no; then
+if test "${TEA_WINDOWINGSYSTEM}" = "x11"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use xft" >&5
$as_echo_n "checking whether to use xft... " >&6; }
# Check whether --enable-xft was given.
@@ -9399,7 +9398,6 @@ $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
@@ -9488,17 +9486,13 @@ $as_echo "$as_me: WARNING: Can't find xft configuration, or xft is unusable" >&2
fi
fi
if test $enable_xft = "yes" ; then
- UNIX_FONT_OBJS=tkUnixRFont.o
$as_echo "#define HAVE_XFT 1" >>confdefs.h
- else
- UNIX_FONT_OBJS=tkUnixFont.o
fi
-
-#fi
+fi
#--------------------------------------------------------------------
# Determine the name of the tclsh and/or wish executables in the
diff --git a/configure.in b/configure.in
index 41fad06..b11b3ea 100755
--- a/configure.in
+++ b/configure.in
@@ -218,7 +218,7 @@ SC_PATH_X
# Check for freetype / fontconfig / Xft support.
#--------------------------------------------------------------------
-#if test $tk_aqua = no; then
+if test "${TEA_WINDOWINGSYSTEM}" = "x11"; then
AC_MSG_CHECKING([whether to use xft])
AC_ARG_ENABLE(xft,
AC_HELP_STRING([--enable-xft],
@@ -281,7 +281,7 @@ SC_PATH_X
fi
AC_SUBST(XFT_CFLAGS)
AC_SUBST(XFT_LIBS)
-#fi
+fi
#--------------------------------------------------------------------
# Determine the name of the tclsh and/or wish executables in the