diff options
| author | mdejong <mdejong> | 2002-05-21 18:27:31 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2002-05-21 18:27:31 (GMT) |
| commit | 3009398fd48768c0775ee9fc23a4d8982abc758f (patch) | |
| tree | 172e06fbd9b02a1aa7c7d1b1522e10f25c308919 /unix/tcl.m4 | |
| parent | 23ed65866c66fe8ecb9291e59cab065483b05323 (diff) | |
| download | tk-3009398fd48768c0775ee9fc23a4d8982abc758f.zip tk-3009398fd48768c0775ee9fc23a4d8982abc758f.tar.gz tk-3009398fd48768c0775ee9fc23a4d8982abc758f.tar.bz2 | |
* unix/configure: Regen.
* unix/configure.in: Invoke SC_ENABLE_SHARED before
calling SC_CONFIG_CFLAGS so that the SHARED_BUILD
variable can be checked inside SC_CONFIG_CFLAGS.
* unix/tcl.m4: Update from Tcl.
Diffstat (limited to 'unix/tcl.m4')
| -rw-r--r-- | unix/tcl.m4 | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4 index e1d619a..0ece801 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -365,6 +365,9 @@ AC_DEFUN(SC_ENABLE_THREADS, [ AC_MSG_RESULT(yes) TCL_THREADS=1 AC_DEFINE(TCL_THREADS) + # USE_THREAD_ALLOC tells us to try the special thread-based + # allocator that significantly reduces lock contention + AC_DEFINE(USE_THREAD_ALLOC) AC_DEFINE(_REENTRANT) AC_DEFINE(_THREAD_SAFE) AC_CHECK_LIB(pthread,pthread_mutex_init,tcl_ok=yes,tcl_ok=no) @@ -1075,7 +1078,11 @@ dnl AC_CHECK_TOOL(AR, ar, :) OSF1-1.*) # OSF/1 1.3 from OSF using ELF, and derivatives, including AD2 SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -shared" + if test "$SHARED_BUILD" = "1" ; then + SHLIB_LD="ld -shared" + else + SHLIB_LD="ld -non_shared" + fi SHLIB_LD_LIBS="" SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" @@ -1086,7 +1093,11 @@ dnl AC_CHECK_TOOL(AR, ar, :) OSF1-V*) # Digital OSF/1 SHLIB_CFLAGS="" - SHLIB_LD='ld -shared -expect_unresolved "*"' + if test "$SHARED_BUILD" = "1" ; then + SHLIB_LD='ld -shared -expect_unresolved "*"' + else + SHLIB_LD='ld -non_shared -expect_unresolved "*"' + fi SHLIB_LD_LIBS="" SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" |