summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2014-01-23 22:38:39 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2014-01-23 22:38:39 (GMT)
commitdaf5a05cbed5ebd093734f1fe936477fc580b4b7 (patch)
treed2de3f09cf9fcb8d3c1d3d6a692c6627d9faf762
parente6b38af9e8fe2ddc0af5678854b6eab9d8cd321c (diff)
downloadtk-daf5a05cbed5ebd093734f1fe936477fc580b4b7.zip
tk-daf5a05cbed5ebd093734f1fe936477fc580b4b7.tar.gz
tk-daf5a05cbed5ebd093734f1fe936477fc580b4b7.tar.bz2
Put -lfontconfig in XFT_LIBS, not XLIBSW flag
-rwxr-xr-xunix/configure2
-rw-r--r--unix/configure.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/unix/configure b/unix/configure
index 1c1a00d..cd11970 100755
--- a/unix/configure
+++ b/unix/configure
@@ -10784,7 +10784,7 @@ echo "$as_me:$LINENO: result: $ac_cv_lib_fontconfig_FcFontSort" >&5
echo "${ECHO_T}$ac_cv_lib_fontconfig_FcFontSort" >&6
if test $ac_cv_lib_fontconfig_FcFontSort = yes; then
- XLIBSW="$XLIBSW -lfontconfig"
+ XFT_LIBS="$XFT_LIBS -lfontconfig"
fi
diff --git a/unix/configure.in b/unix/configure.in
index 5b74bb5..d9862ef 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -516,7 +516,7 @@ if test $tk_aqua = no; then
tk_oldLibs=$LIBS
LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW -lfontconfig"
AC_CHECK_LIB(fontconfig, FcFontSort, [
- XLIBSW="$XLIBSW -lfontconfig"
+ XFT_LIBS="$XFT_LIBS -lfontconfig"
], [])
CFLAGS=$tk_oldCFlags
LIBS=$tk_oldLibs