* config/ltmain.m4sh (func_mode_link): Make Gary's new tests

pass. When the output wrapper script is not in the current
directory, we can not use an rpath which is relative to the
current directory. Use an absolute path instead.

diff --git a/ChangeLog b/ChangeLog
index 781508763c70a57fd81ed0c46cebc644f3e808a6..ef2619f0b6f14803971f44b8ff740064044bfeea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-23  Peter O'Gorman  <peter@pogma.com>
+
+       * config/ltmain.m4sh (func_mode_link): Make Gary's new tests
+       pass. When the output wrapper script is not in the current
+       directory, we can not use an rpath which is relative to the
+       current directory. Use an absolute path instead.
+
 2004-10-22  Gary V. Vaughan  <gary@gnu.org>
 
        * clcommit.m4sh: Add --rcfile option.

diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh
index 4191b7fc5d552abe4c78740ebc4aa7915bc5564a..5f41f04433503f1ac467d1eda40f252bbd1765d5 100644 (file)
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -5495,7 +5495,17 @@ EOF
            ;;
          *)
            # Relative path: add a thisdir entry.
-           rpath="$rpath\$thisdir/$dir:"
+               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