diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | unix/configure | 2 | ||||
| -rw-r--r-- | unix/configure.in | 4 |
3 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2006-12-06 Kevin Kenny <kennykb@acm.org> + + * unix/configure.in: Further changes to avoid attempting to link + * unix/configure: against Xft libraries in a non-Xft build + [Bug 1609616] (dgp) + 2006-12-04 Jeff Hobbs <jeffh@ActiveState.com> * generic/tkListbox.c (ConfigureListboxItem): ListboxWorldChanged not diff --git a/unix/configure b/unix/configure index 2ad2e29..337e4cc 100755 --- a/unix/configure +++ b/unix/configure @@ -9610,6 +9610,8 @@ fi echo "$as_me: WARNING: Can't find xft configuration, or xft is unusable" >&2;} fi enable_xft=no + XFT_CFLAGS="" + XFT_LIBS="" else enable_xft=yes fi diff --git a/unix/configure.in b/unix/configure.in index 5d8320f..703a605 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tk installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.129 2006/11/27 19:08:56 kennykb Exp $ +# RCS: @(#) $Id: configure.in,v 1.130 2006/12/06 16:22:04 kennykb Exp $ AC_INIT([tk],[8.5]) AC_PREREQ(2.59) @@ -472,6 +472,8 @@ if test $tk_aqua = no; then AC_MSG_WARN([Can't find xft configuration, or xft is unusable]) fi enable_xft=no + XFT_CFLAGS="" + XFT_LIBS="" else enable_xft=yes fi |