* config/ltmain.m4sh: Remove code which is no longer needed

now that temp_rpath only contains fully-qualified elements.

diff --git a/ChangeLog b/ChangeLog
index 9e60179839da422d630cf05674044fcbe897364d..b88414d253c8921c6bf23084e2c21a56359ec165 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-02  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
+
+       * config/ltmain.m4sh: Remove code which is no longer needed
+       now that temp_rpath only contains fully-qualified elements.
+
 2004-11-29  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * m4/libtool.m4 (_LT_LINKER_SHLIBS): Treat linux-dietlibc with

diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh
index 5d295ec686d38fc9ae09585c571c5d10893764f4..36279bb42536bbc0935eb7120f27838685118cea 100644 (file)
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -3517,9 +3517,8 @@ func_mode_link ()
            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
 
@@ -5494,24 +5493,6 @@ EOF
        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.
-           rpath="$rpath\$thisdir/$dir:"
-           ;;
-         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