Fix TCL_RPATH to explicitly insert system library path into

"-blibpath:" on AIX.

ticket: 1228

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14993 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index 50a46008c0e9dde58f20cc6ef4d8f0aebe69adad..bb2bf7919f40b31d2812ee1b1ca8eadcd4ab84b3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-12  Tom Yu  <tlyu@mit.edu>
+
+       * aclocal.m4 (tcl_lib): Add RPATH_TAIL to TCL_RPATH to handle AIX
+       weirdness with "-blibpath:".
+
 2002-11-04  Tom Yu  <tlyu@mit.edu>
 
        * aclocal.m4 (AC_KRB5_TCL_FIND_CONFIG): Set TCL_MAYBE_RPATH.

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index c819d32d78e858bc456eeb1c83571fd6ff6407ff..8a4099cd58360c326381e4d023c9c677f634135e 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -829,7 +829,7 @@ if test -n "$tcl_ok_conf" ; then
   TCL_LIBPATH="-L$TCL_EXEC_PREFIX/lib"
   TCL_RPATH=":$TCL_EXEC_PREFIX/lib"
   if test "$DEPLIBEXT" != "$SHLIBEXT" && test -n "$RPATH_FLAG"; then
-    TCL_MAYBE_RPATH='$(RPATH_FLAG)'"$TCL_EXEC_PREFIX/lib"
+    TCL_MAYBE_RPATH='$(RPATH_FLAG)'"$TCL_EXEC_PREFIX/lib$RPATH_TAIL"
   else
     TCL_MAYBE_RPATH=
   fi

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index e395d4e28b827cd3b5205d483034794f348b844f..c4c9e62f4a601dc87686662878ebedf17ab8d768 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-12  Tom Yu  <tlyu@mit.edu>
+
+       * shlib.conf: Fix AIX to explicitly include system libraries in
+       "-blibpath:" by adding a variable RPATH_TAIL.  Fix typo in non-gcc
+       case.
+
 2002-11-08  Ken Raeburn  <raeburn@mit.edu>
 
        * pre.in (.et.h, .et.c): Drop "set -x".

diff --git a/src/config/shlib.conf b/src/config/shlib.conf
index cae844cf1c2cdcb7fd1ea1d00ecb0c1a99434118..da68b568c1f55b96dcd8c180a6392e0155dd4d59 100644 (file)
--- a/src/config/shlib.conf
+++ b/src/config/shlib.conf
@@ -291,9 +291,10 @@ mips-*-netbsd*)
        if test "$krb5_cv_prog_gcc" = "yes" ; then
          RPATH_FLAG='-Wl,-blibpath:'
        else
-         RPATH_FLAG=-bilbpath:
+         RPATH_FLAG=-blibpath:
        fi
-       CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH):/usr/lib:/lib $(LDFLAGS)'
+       RPATH_TAIL=:/usr/lib:/lib
+       CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH):'"$RPATH_TAIL"'$(LDFLAGS)'
        CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(LDFLAGS)'
        # $(PROG_RPATH) is here to handle things like a shared tcl library
        RUN_ENV='LIBPATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`:$(PROG_RPATH):/usr/lib:/usr/local/lib; export LIBPATH; '