From 63c98ed9b6dfd081afdc878fd8011bfa08eedfa2 Mon Sep 17 00:00:00 2001
From: rmax <rmax>
Date: Wed, 9 Mar 2011 16:55:50 +0000
Subject: Fix libXft check

---
 ChangeLog         | 6 ++++++
 unix/configure.in | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f835f0d..850d63e 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-01-25  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* generic/tkSelect.c: [Patch #3129527]: Fix buffer overflow w/ GCC 4.5 and
diff --git a/unix/configure.in b/unix/configure.in
index 87000aa..9d49fc3 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -552,7 +552,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
-- 
cgit v0.12