diff options
author | mdejong <mdejong> | 2003-04-04 19:29:33 (GMT) |
---|---|---|
committer | mdejong <mdejong> | 2003-04-04 19:29:33 (GMT) |
commit | 7da91f4ded6684e544186183922f03297ff2eeb1 (patch) | |
tree | 61073b2439ecc4db824226610c02c10203606a3c /unix/Makefile.in | |
parent | c0d490caba1f47f95ebb1aeb5e83794329b88293 (diff) | |
download | tk-7da91f4ded6684e544186183922f03297ff2eeb1.zip tk-7da91f4ded6684e544186183922f03297ff2eeb1.tar.gz tk-7da91f4ded6684e544186183922f03297ff2eeb1.tar.bz2 |
* unix/Makefile.in: Subst TCL_LIBS instead of
DL_LIBS and MATH_LIBS.
* unix/configure: Regen.
* unix/configure.in: Remove SC_ENABLE_THREADS
invocation. Thread support in an extension
should be automatic when Tcl is compiled
with thread support. Add AC_DEFINE calls
to set TCL_THREADS, _REENTRANT, and
_THREAD_SAFE since this was done in
SC_ENABLE_THREADS. Remove socket and math
lib checks since these are already done in
the Tcl configure script.
* unix/tcl.m4: Update from Tcl to get
TCL_LIBS fix. This fixes bug 597847
which was caused by improper linking.
* unix/tkConfig.sh.in: Subst TCL_LIBS
instead of MATH_LIBS and DL_LIBS.
[Bug 597847]
Diffstat (limited to 'unix/Makefile.in')
-rw-r--r-- | unix/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index a20a3e3..ca362a7 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.87 2002/11/19 02:20:35 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.88 2003/04/04 19:29:38 mdejong Exp $ # Current Tk version; used in various names. @@ -226,8 +226,8 @@ TCL_STUB_FLAGS = @TCL_STUB_FLAGS@ # Libraries to use when linking. This definition is determined by the # configure script. -LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ +LIBS = @LIBS@ $(X11_LIB_SWITCHES) @TCL_LIBS@ +WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @TCL_LIBS@ # The symbol below provides support for dynamic loading and shared # libraries. See configure.in for a description of what it means. |