* unix/configure.in: Applied patch from Jan Nijtmans to fix the

following problems:
    - There seems to be a HP-UX-11 already, which behaves
      identical to HP-UX-10.
    - For 64-bit IRIX, SHLIB_LD_LIBS should be set to
      '${LIBS}'. This also has the side-effect that SHLIB_LD
      doesn't need the -rpath option any more: it is already part
      of ${LIBS}
    - Fix Linux to use the -rpath option.
    - On Solaris, LD_SEARCH_FLAGS can only be used with the
      linker, not with the compiler, because the "-Wl," part is
      missing.
    - The TCL_LD_SEARCH_FLAGS should be used in static executables
      as well as dynamically linked ones. Otherwise, static
      executables have a different search strategy for dynamically
      loadable stub-enabled extensions than executables using
      shared libraries.  This effects extensions which load other
      libraries in turn.

2 files changed, 27 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 69c51dc..e688b25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,24 @@
 1999-03-05    <stanton@GASPODE>
-	
+
+	* unix/configure.in: Applied patch from Jan Nijtmans to fix the
+	following problems: 
+	    - There seems to be a HP-UX-11 already, which behaves
+	      identical to HP-UX-10.
+	    - For 64-bit IRIX, SHLIB_LD_LIBS should be set to
+	      '${LIBS}'. This also has the side-effect that SHLIB_LD
+	      doesn't need the -rpath option any more: it is already part
+	      of ${LIBS}
+	    - Fix Linux to use the -rpath option.
+	    - On Solaris, LD_SEARCH_FLAGS can only be used with the
+	      linker, not with the compiler, because the "-Wl," part is
+	      missing.
+	    - The TCL_LD_SEARCH_FLAGS should be used in static executables
+	      as well as dynamically linked ones. Otherwise, static
+	      executables have a different search strategy for dynamically
+	      loadable stub-enabled extensions than executables using
+	      shared libraries.  This effects extensions which load other
+	      libraries in turnq.
+
 	* generic/tclCompile.h:
 	* generic/tclStubInit.c:
 	* generic/tclCompileDecls.h:
diff --git a/unix/configure.in b/unix/configure.in
index 2744f02..b750d9d 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -2,7 +2,7 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tcl installation
 dnl	to configure the system for the local environment.
 AC_INIT(../generic/tcl.h)
-# RCS: @(#) $Id: configure.in,v 1.28.4.1 1999/03/03 00:38:45 stanton Exp $
+# RCS: @(#) $Id: configure.in,v 1.28.4.2 1999/03/06 00:36:21 stanton Exp $
 
 TCL_VERSION=8.0
 TCL_MAJOR_VERSION=8
@@ -744,7 +744,7 @@ case $system in
 	LD_FLAGS=""
 	LD_SEARCH_FLAGS=""
 	;;
-    HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*)
+    HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*|HP-UX-*.11.*)
 	SHLIB_SUFFIX=".sl"
 	AC_CHECK_LIB(dld, shl_load, tcl_ok=yes, tcl_ok=no)
 	if test "$tcl_ok" = yes; then
@@ -794,8 +794,8 @@ case $system in
 	;;
     IRIX64-6.*)
 	SHLIB_CFLAGS=""
-	SHLIB_LD="ld -32 -shared -rdata_shared -rpath /usr/local/lib"
-	SHLIB_LD_LIBS=""
+	SHLIB_LD="ld -32 -shared -rdata_shared"
+	SHLIB_LD_LIBS='${LIBS}'
 	SHLIB_SUFFIX=".so"
 	DL_OBJS="tclLoadDl.o"
 	DL_LIBS=""
@@ -811,7 +811,7 @@ case $system in
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
 	    LD_FLAGS="-rdynamic"
-	    LD_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS="-Wl,-rpath,${LIB_RUNTIME_DIR}"
 	else
 	    AC_CHECK_HEADER(dld.h, [
 		SHLIB_LD="ld -shared"
@@ -978,7 +978,7 @@ case $system in
 	DL_OBJS="tclLoadDl.o"
 	DL_LIBS="-ldl"
 	LD_FLAGS=""
-	LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
+	LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
 	;;
     ULTRIX-4.*)
 	SHLIB_CFLAGS="-G 0"
@@ -1243,7 +1243,7 @@ else
 	    ;;
     esac
     TCL_SHLIB_CFLAGS=""
-    TCL_LD_SEARCH_FLAGS=""
+    TCL_LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS}"
     eval "TCL_LIB_FILE=libtcl${TCL_UNSHARED_LIB_SUFFIX}"
     MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}"
 fi