summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrmax <rmax>2011-03-09 17:03:34 (GMT)
committerrmax <rmax>2011-03-09 17:03:34 (GMT)
commit752451859dfcfc5dd3dc14b0b4844021d6230775 (patch)
tree48e4ac426beec09918f22bfb2c93ac19bfeb3159
parenta3a3b426b9ca445ba8a592ad24cdb96a8012e48e (diff)
parent5ba718b216bdda08a41756b291018117fb3cb6d7 (diff)
downloadtk-752451859dfcfc5dd3dc14b0b4844021d6230775.zip
tk-752451859dfcfc5dd3dc14b0b4844021d6230775.tar.gz
tk-752451859dfcfc5dd3dc14b0b4844021d6230775.tar.bz2
Fix libXft check
-rw-r--r--ChangeLog6
-rw-r--r--unix/configure.in2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index afcabb3..602324b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-09 Reinhard Max <max@suse.de>
+
+ * unix/configure.in: Use a symbol from libXft itself for the link
+ test rather than one from libfreetype, because the latter doesn't
+ work when the linker is called with --as-needed.
+
2011-03-03 Alexandre Ferrieux <ferrieux@users.sourceforge.net>
* generic/tkCanvLine.c: [Bug 3175610]: Incomplete refresh of line items.
diff --git a/unix/configure.in b/unix/configure.in
index f2e4e4b..36a5fb0 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -572,7 +572,7 @@ if test $tk_aqua = no; then
CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
tk_oldLibs=$LIBS
LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW"
- AC_CHECK_LIB(Xft, FT_New_Face, [], [
+ AC_CHECK_LIB(Xft, XftFontOpen, [], [
found_xft=no
])
CFLAGS=$tk_oldCFlags