summaryrefslogtreecommitdiffstats
path: root/unix/tcl.m4
diff options
context:
space:
mode:
authornijtmans <nijtmans>2008-10-08 21:36:47 (GMT)
committernijtmans <nijtmans>2008-10-08 21:36:47 (GMT)
commit61a9c44c70087f9eb7e1d3f0284c4cea2a21840d (patch)
treecef4a36c8192cfb54bb6ce8340addb809f806ee9 /unix/tcl.m4
parentfc8311ca1ea7910975b3ecc853f51c687fe1aec7 (diff)
downloadtk-61a9c44c70087f9eb7e1d3f0284c4cea2a21840d.zip
tk-61a9c44c70087f9eb7e1d3f0284c4cea2a21840d.tar.gz
tk-61a9c44c70087f9eb7e1d3f0284c4cea2a21840d.tar.bz2
* unix/tcl.m4: fix for bug [2073255]
* unix/configure: regenerated
Diffstat (limited to 'unix/tcl.m4')
-rw-r--r--unix/tcl.m415
1 files changed, 7 insertions, 8 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index c5be8f0..3e4979a 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1262,25 +1262,24 @@ dnl AC_CHECK_TOOL(AR, ar)
])
AC_CHECK_LIB(dld, shl_load, tcl_ok=yes, tcl_ok=no)
AS_IF([test "$tcl_ok" = yes], [
- SHLIB_CFLAGS="+z"
- SHLIB_LD="ld -b"
SHLIB_LD_LIBS='${LIBS}'
DL_OBJS="tclLoadShl.o"
DL_LIBS="-ldld"
LDFLAGS="$LDFLAGS -Wl,-E"
CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
- LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
+ LD_SEARCH_FLAGS='-Wl,+s +b ${LIB_RUNTIME_DIR}:.'
LD_LIBRARY_PATH_VAR="SHLIB_PATH"
])
AS_IF([test "$GCC" = yes], [
SHLIB_LD='${CC} -shared'
- SHLIB_LD_LIBS='${LIBS}'
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ ], [
+ CFLAGS="$CFLAGS -z"
+ # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc
+ #CFLAGS="$CFLAGS +DAportable"
+ SHLIB_CFLAGS="+z"
+ SHLIB_LD="${CC} -Wl,-b"
])
- # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc
- #CFLAGS="$CFLAGS +DAportable"
-
# Check to enable 64-bit flags for compiler/linker
AS_IF([test "$do64bit" = "yes"], [
AS_IF([test "$GCC" = yes], [