summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2002-04-26 19:32:54 (GMT)
committerhobbs <hobbs>2002-04-26 19:32:54 (GMT)
commit09bf9bc63f9ba75fa56811474a18049ed8296e87 (patch)
tree37f78aae2652716e0f0d5a88af537fc603f5016a
parent6011ab574a8c116b75f20216de45e4f7c6a3d397 (diff)
downloadtk-09bf9bc63f9ba75fa56811474a18049ed8296e87.zip
tk-09bf9bc63f9ba75fa56811474a18049ed8296e87.tar.gz
tk-09bf9bc63f9ba75fa56811474a18049ed8296e87.tar.bz2
* unix/configure:
* unix/tcl.m4: change HP-11 SHLIB_LD_LIBS from "" to ${LIBS} so that the .sl knows its dependent libs.
-rw-r--r--ChangeLog6
-rwxr-xr-xunix/configure4
-rw-r--r--unix/tcl.m44
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e8d61c0..ca05242 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-26 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * unix/configure:
+ * unix/tcl.m4: change HP-11 SHLIB_LD_LIBS from "" to ${LIBS} so
+ that the .sl knows its dependent libs.
+
2002-04-24 Daniel Steffen <das@users.sourceforge.net>
* mac/tkMacTclCode.r:
diff --git a/unix/configure b/unix/configure
index 970d1bc..e913685 100755
--- a/unix/configure
+++ b/unix/configure
@@ -2118,7 +2118,7 @@ fi
if test "$tcl_ok" = yes; then
SHLIB_CFLAGS="+z"
SHLIB_LD="ld -b"
- SHLIB_LD_LIBS=""
+ SHLIB_LD_LIBS='${LIBS}'
DL_OBJS="tclLoadShl.o"
DL_LIBS="-ldld"
LDFLAGS="-Wl,-E"
@@ -2488,7 +2488,7 @@ fi
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
LDFLAGS="-export-dynamic"
- LD_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
if test "${TCL_THREADS}" = "1" ; then
EXTRA_CFLAGS="-pthread"
LDFLAGS="$LDFLAGS -pthread"
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 13234da..e1d619a 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -799,7 +799,7 @@ dnl AC_CHECK_TOOL(AR, ar, :)
if test "$tcl_ok" = yes; then
SHLIB_CFLAGS="+z"
SHLIB_LD="ld -b"
- SHLIB_LD_LIBS=""
+ SHLIB_LD_LIBS='${LIBS}'
DL_OBJS="tclLoadShl.o"
DL_LIBS="-ldld"
LDFLAGS="-Wl,-E"
@@ -1019,7 +1019,7 @@ dnl AC_CHECK_TOOL(AR, ar, :)
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
LDFLAGS="-export-dynamic"
- LD_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
if test "${TCL_THREADS}" = "1" ; then
EXTRA_CFLAGS="-pthread"
LDFLAGS="$LDFLAGS -pthread"