From 789cb9ff828c1e461866814e57d87a5c254b8c24 Mon Sep 17 00:00:00 2001 From: dgp <dgp@users.sourceforge.net> Date: Fri, 29 Aug 2008 03:36:54 +0000 Subject: * unix/tkConfig.sh.in: Added @XFT_LIBS@ to the definition of TK_LIBS to avoid link failures when a "big wish" program links against a --disable-shared build of libtk. (Discovered building expectTk). --- ChangeLog | 6 +++++- unix/tkConfig.sh.in | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 215c609..d6bac7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ -2008-08-22 Don Porter <dgp@users.sourceforge.net> +2008-08-28 Don Porter <dgp@users.sourceforge.net> + + * unix/tkConfig.sh.in: Added @XFT_LIBS@ to the definition of TK_LIBS + to avoid link failures when a "big wish" program links against a + --disable-shared build of libtk. (Discovered building expectTk). * generic/tkImgPhoto.c: Changed TclStack* calls to ck* calls so that we don't create new dependencies on Tcl internals. diff --git a/unix/tkConfig.sh.in b/unix/tkConfig.sh.in index 7657e40..7d7d05b 100644 --- a/unix/tkConfig.sh.in +++ b/unix/tkConfig.sh.in @@ -11,7 +11,7 @@ # # The information in this file is specific to a single platform. # -# RCS: @(#) $Id: tkConfig.sh.in,v 1.13 2007/12/13 15:28:50 dgp Exp $ +# RCS: @(#) $Id: tkConfig.sh.in,v 1.14 2008/08/29 03:36:55 dgp Exp $ # Tk's version number. TK_VERSION='@TK_VERSION@' @@ -34,7 +34,7 @@ TK_DBGX= TK_LIB_FILE='@TK_LIB_FILE@' # Additional libraries to use when linking Tk. -TK_LIBS='@XLIBSW@ @LIBS@ @TCL_LIBS@' +TK_LIBS='@XLIBSW@ @XFT_LIBS@ @LIBS@ @TCL_LIBS@' # Top-level directory in which Tk's platform-independent files are # installed. -- cgit v0.12