CVS Head - patch to remove extraneous code in temp_rpath calcs.

[Bob Friesenhahn]

The following patch removes code which is no longer needed.  Ok to 
apply?

Bob

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libtool/libtool/ChangeLog,v
retrieving revision 1.1765
diff -u -r1.1765 ChangeLog
--- ChangeLog   28 Nov 2004 19:55:39 -0000      1.1765
+++ ChangeLog   29 Nov 2004 03:14:52 -0000
@@ -1,3 +1,8 @@
+2004-11-28  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-28  Ralf Wildenhues  <address@hidden>

        * config/ltmain.m4sh (func_mode_link): $dlsymsobj is really
Index: config/ltmain.m4sh
===================================================================
RCS file: /cvsroot/libtool/libtool/config/ltmain.m4sh,v
retrieving revision 1.27
diff -u -r1.27 ltmain.m4sh
--- config/ltmain.m4sh  28 Nov 2004 19:55:40 -0000      1.27
+++ config/ltmain.m4sh  29 Nov 2004 03:14:53 -0000
@@ -3516,7 +3516,6 @@
            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" ;;
              esac
@@ -5490,26 +5489,7 @@
        # 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
+         rpath="$rpath$dir:"
        done
        temp_rpath="$rpath"
       fi

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