[svn-r3838] Purpose:

    (Final?) Bug Fix
Description:
    Okay, for those of you following this saga:

        Shared libraries weren't being found on the O2K system. Why not?
        Well, turns out that libtool is dain bramaged. Instead of
        creating executables for executables, it creates shell scripts.
        These shell scripts actually recompile the code, relinking it
        with the "correct" libraries. It's similar to when it goes to do
        an install. It recompiles to the binary so that it picks up the
        proper libraries. BUT! Libtool wasn't placing into the shell
        scripts where the shared libraries it was looking for actually
        were.
Solution:
    I hacked up ltmain.sh so that it puts the required dynamic library
    directories into the compile line when it creates the
    shell-script/binaries.
Platforms tested:
    Modi4...

1 files changed, 4 insertions, 13 deletions

diff --git a/bin/ltmain.sh b/bin/ltmain.sh
index 40e5ab0..f5edf8a 100644
--- a/bin/ltmain.sh
+++ b/bin/ltmain.sh
@@ -2457,19 +2457,10 @@ EOF
       # "recompile" just before execution. -BW 20. April 2001
       case "$host" in
       *irix[56]*)
-        bar='';
-        libs=`echo $rpath | sed -e "s#${wl}-rpath ${wl}##" | sed -e 's#:# #g'`;
-        for foo in X $libs; do
-          if test "$foo" != "X"; then
-            if test -n "$bar"; then
-              bar="$bar ${wl}-rpath ${wl}$foo";
-            else
-              bar="${wl}-rpath ${wl}$foo";
-            fi;
-          fi;
-        done
-        finalize_rpath="$bar";
-        compile_rpath="$bar"
+        pwd=`pwd`;
+	rpath="$rpath:$pwd/.libs:$pwd/../src/.libs";
+        finalize_rpath=`echo $rpath | sed -e "s#:# ${wl}-rpath ${wl}#g"`;
+        compile_rpath=`echo $rpath | sed -e "s#:# ${wl}-rpath ${wl}#g"`;
         ;;
       *)
         finalize_rpath="$rpath";