use absolute directory paths in dllsearchpath

diff --git a/ChangeLog b/ChangeLog
index 98eec59789440a454280eba788a405936508c719..7434ab594b88c950322ae0e6d68fab0f6fc5f5fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 1999-01-06  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+       
+       * ltmain.in (dllsearchpath): add absolute directory paths to
+       dllsearchpath so that the wrapper scripts can be called from any
+       directory (e.g. tests) on cygwin.
 
        * ltconfig.in (cygwin, library_names_spec): revert Alexandre's
        change from yesterday to use `-dll.a' suffix.  That change caused

diff --git a/ltmain.in b/ltmain.in
index 1be5bccf9a21d19483f18f08e5910a821e88129e..dc50566b5749bc61f8f69a3c37af38057ade3901 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -767,10 +767,12 @@ compiler."
        case "$host" in
        *-*-cygwin32* | *-*-mingw32* | *-*-os2*)
          compile_dependencylibs="$compile_dependencylibs $arg"
+         dllsearchdir="`expr $arg : '-L\(.*\)'`"
+         dllsearchdir=`cd "$dllsearchdir" && pwd || echo "$dllsearchdir"`
          if test -n "$dllsearchpath"; then
-           dllsearchpath="$dllsearchpath:`expr $arg : '-L\(.*\)'`"
+           dllsearchpath="$dllsearchpath:$dllsearchdir"
          else
-           dllsearchpath="`expr $arg : '-L\(.*\)'`"
+           dllsearchpath="$dllsearchdir"
          fi
          ;;
        esac
@@ -1003,10 +1005,11 @@ compiler."
              case "$host" in
              *-*-cygwin32* | *-*-mingw32* | *-*-os2*)
                compile_dependencylibs="$compile_dependencylibs -L$dir -l$name"
+               dllsearchdir=`cd "$dir" && pwd || echo "$dir"`
                if test -n "$dllsearchpath"; then
-                 dllsearchpath="$dllsearchpath:$dir"
+                 dllsearchpath="$dllsearchpath:$dllsearchdir"
                else
-                 dllsearchpath="$dir"
+                 dllsearchpath="$dllsearchdir"
                fi
                ;;
              esac