HEAD branch temp_rpath patch try #2

[Bob Friesenhahn]

Here is a patch to HEAD to remove unnecessary code.

Ok to commit?

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libtool/libtool/ChangeLog,v
retrieving revision 1.1771
diff -u -r1.1771 ChangeLog
--- ChangeLog   30 Nov 2004 20:46:21 -0000      1.1771
+++ ChangeLog   2 Dec 2004 02:04:40 -0000
@@ -1,3 +1,8 @@
+2004-12-01  Bob Friesenhahn  <address@hidden>
+
+       * config/ltmain.m4sh: Remove code which is no longer needed
+       now that temp_rpath only contains fully-qualified elements.
+
 2004-11-30  Ralf Wildenhues  <address@hidden>

        * config/general.m4sh: basename sed-subst is anchored and thus
Index: config/ltmain.m4sh
===================================================================
RCS file: /cvsroot/libtool/libtool/config/ltmain.m4sh,v
retrieving revision 1.29
diff -u -r1.29 ltmain.m4sh
--- config/ltmain.m4sh  30 Nov 2004 20:46:23 -0000      1.29
+++ config/ltmain.m4sh  2 Dec 2004 02:04:41 -0000
@@ -3538,9 +3538,8 @@
            if test -n "$shlibpath_var"; then
              # Make sure the rpath contains only unique directories.
              case "$temp_rpath " in
-             *" $dir "*) ;;
-             *" $absdir "*) ;;
-             *) temp_rpath="$temp_rpath $absdir" ;;
+             *"$absdir:"*) ;;
+             *) temp_rpath="$temp_rpath:$absdir" ;;
              esac
            fi

@@ -5508,34 +5507,6 @@
        exit $status
       fi

-      if test -n "$shlibpath_var"; then
-       # We should set the shlibpath_var
-       rpath=
-       for dir in $temp_rpath; do
-         case $dir in
-         [[\\/]]* | [[A-Za-z]]:[[\\/]]*)
-           # Absolute path.
-           rpath="$rpath$dir:"
-           ;;
-         *)
-           # Relative path: add a thisdir entry.
-               case "$output" in
-               *[[\\/]]*)
-                 # the output file is not in the current dir
-                 # so we need an absolute path.
-                 absdir=`cd "$dir" && pwd`
-                 rpath="$rpath$absdir:"
-                 ;;
-               *)
-                 rpath="$rpath\$thisdir/$dir:"
-             ;;
-           esac
-           ;;
-         esac
-       done
-       temp_rpath="$rpath"
-      fi
-
       if test -n "$compile_shlibpath$finalize_shlibpath"; then
        
compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\"
 $compile_command"
       fi

======================================
Bob Friesenhahn
address@hidden
http://www.simplesystems.org/users/bfriesen