From: Tom Yu <tlyu@mit.edu>
Date: Tue, 12 Nov 2002 23:47:31 +0000 (+0000)
Subject: Fix TCL_RPATH to explicitly insert system library path into
X-Git-Tag: krb5-1.3-alpha1~278
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3713491be86bd50a55b5525a068ed719c1201977;p=krb5.git

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 50a46008c..bb2bf7919 100644
--- 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 c819d32d7..8a4099cd5 100644
--- 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 e395d4e28..c4c9e62f4 100644
--- 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 cae844cf1..da68b568c 100644
--- 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; '