diff options
| author | dgp <dgp@users.sourceforge.net> | 2008-08-29 03:35:44 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2008-08-29 03:35:44 (GMT) |
| commit | c5f2cdbaee955094587bb6fd825169fde60f1c57 (patch) | |
| tree | d799acaa74407f444d490b7c9635695b60168148 | |
| parent | 81cd4716d7b562058df7561e86ff2d4a2cde9b13 (diff) | |
| download | tk-c5f2cdbaee955094587bb6fd825169fde60f1c57.zip tk-c5f2cdbaee955094587bb6fd825169fde60f1c57.tar.gz tk-c5f2cdbaee955094587bb6fd825169fde60f1c57.tar.bz2 | |
* 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).
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | unix/tkConfig.sh.in | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,5 +1,9 @@ 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/tk.h: Bump version number to 8.5.5b1 to distinguish * library/tk.tcl: CVS development snapshots from the 8.5.4 and * unix/configure.in: 8.5.5 releases. diff --git a/unix/tkConfig.sh.in b/unix/tkConfig.sh.in index 7657e40..f4e10ce 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.13.2.1 2008/08/29 03:35:47 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. |