From 995b5afa7bcde994ddf78ac8a3d01b75fe6ae20e Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Wed, 6 Jan 1999 17:51:59 +0000 Subject: [PATCH] use absolute directory paths in dllsearchpath --- ChangeLog | 4 ++++ ltmain.in | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 98eec5978..7434ab594 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ 1999-01-06 Gary V. Vaughan + + * 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 1be5bccf9..dc50566b5 100644 --- 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 -- 2.47.2