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/tcl.m4 | |
| 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/tcl.m4')
| -rw-r--r-- | unix/tcl.m4 | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 10f9a06..88eaa56 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -705,6 +705,9 @@ AC_DEFUN(SC_CONFIG_MANPAGES, [ # The name of the built export / import file which # should be used to link to the Tcl shared library. # Empty if Tcl is unshared. +# TCL_LIBS - +# Libs to use when linking Tcl shell or some other +# shell that includes Tcl libs. # CFLAGS_DEBUG - # Flags used when running the compiler in debug mode # CFLAGS_OPTIMIZE - @@ -1739,7 +1742,18 @@ dnl esac INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(STUB_LIB_FILE))' fi + # Define TCL_LIBS now that we know what DL_LIBS is. + # The trick here is that we don't want to change + # the value of TCL_LIBS if it is already set when + # tclConfig.sh had been loaded by Tk. + if test "x${TCL_LIBS}" = "x"; then + TCL_LIBS="${DL_LIBS} ${LIBS} ${MATH_LIBS}" + fi + AC_SUBST(TCL_LIBS) + # FIXME: This subst was left in only because the TCL_DL_LIBS + # entry in tclConfig.sh uses it. It is not clear why someone + # would use TCL_DL_LIBS instead of TCL_LIBS. AC_SUBST(DL_LIBS) AC_SUBST(DL_OBJS) @@ -2274,19 +2288,13 @@ AC_DEFUN(SC_BUGGY_STRTOD, [ # -lnsl) are dealt with here. # # Arguments: -# Requires the following vars to be set in the Makefile: -# DL_LIBS -# LIBS -# MATH_LIBS +# None. # # Results: # -# Subst's the following var: -# TCL_LIBS -# MATH_LIBS -# # Might append to the following vars: # LIBS +# MATH_LIBS # # Might define the following vars: # HAVE_NET_ERRNO_H @@ -2343,13 +2351,6 @@ AC_DEFUN(SC_TCL_LINK_LIBS, [ fi AC_CHECK_FUNC(gethostbyname, , [AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])]) - - # Don't perform the eval of the libraries here because DL_LIBS - # won't be set until we call SC_CONFIG_CFLAGS - - TCL_LIBS='${DL_LIBS} ${LIBS} ${MATH_LIBS}' - AC_SUBST(TCL_LIBS) - AC_SUBST(MATH_LIBS) ]) #-------------------------------------------------------------------- |