diff options
| author | rmax <rmax> | 2011-03-09 16:55:50 (GMT) |
|---|---|---|
| committer | rmax <rmax> | 2011-03-09 16:55:50 (GMT) |
| commit | 63c98ed9b6dfd081afdc878fd8011bfa08eedfa2 (patch) | |
| tree | 422a8746d78ff7acd2c32184b5f3585e778851f1 | |
| parent | 9d74de0f4ce62bdac346aa1dee4b991d7ae08b30 (diff) | |
| download | tk-63c98ed9b6dfd081afdc878fd8011bfa08eedfa2.zip tk-63c98ed9b6dfd081afdc878fd8011bfa08eedfa2.tar.gz tk-63c98ed9b6dfd081afdc878fd8011bfa08eedfa2.tar.bz2 | |
Fix libXft check
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | unix/configure.in | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -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 |