diff options
| author | rmax <rmax> | 2011-03-09 17:03:34 (GMT) |
|---|---|---|
| committer | rmax <rmax> | 2011-03-09 17:03:34 (GMT) |
| commit | e3936d97898ad60cae3136709e8d443c97f4515d (patch) | |
| tree | 48e4ac426beec09918f22bfb2c93ac19bfeb3159 | |
| parent | 46660fcc6c4e03b9e06fcec424cf42aaef363a53 (diff) | |
| parent | 63c98ed9b6dfd081afdc878fd8011bfa08eedfa2 (diff) | |
| download | tk-e3936d97898ad60cae3136709e8d443c97f4515d.zip tk-e3936d97898ad60cae3136709e8d443c97f4515d.tar.gz tk-e3936d97898ad60cae3136709e8d443c97f4515d.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-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 |