diff options
| author | mdejong <mdejong> | 2002-05-21 18:17:54 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2002-05-21 18:17:54 (GMT) |
| commit | 6894740029f61262bf530094fe3975e078f69321 (patch) | |
| tree | 67fc2c34f8ee8dcca0424a1e00800bcd053824a4 /unix/tcl.m4 | |
| parent | e0c4b53d5b6dd002350c769dbb457b715f63daed (diff) | |
| download | tcl-6894740029f61262bf530094fe3975e078f69321.zip tcl-6894740029f61262bf530094fe3975e078f69321.tar.gz tcl-6894740029f61262bf530094fe3975e078f69321.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 (SC_CONFIG_CFLAGS): Pass -non_shared
instead of -shared to ld when configured with
--disable-shared under OSF. [Tcl bug 540390]
Diffstat (limited to 'unix/tcl.m4')
| -rw-r--r-- | unix/tcl.m4 | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 413255e..0ece801 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1078,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" @@ -1089,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" |