* 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 6032438622fbddc8c9e8c323d00b07258a7fa425..8e206e2a5c4ddb476da241a33d12570de2147d2a 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-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * config/general.m4sh: basename sed-subst is anchored and thus

diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh
index 62b0e097025e99a8545e9e041068b78b5d57a6d6..5f91698afc8b26e2b0643252a8ea932049d72295 100644 (file)
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -3538,9 +3538,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
 
@@ -5508,34 +5507,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.
-               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