* ltmain.in (link mode): add foo/bin for every foo/lib in

dllsearchpath when creating wrapper script.  Fixes
build-relink2 test failure.
Backport of CVS HEAD 2004-10-13.

diff --git a/ChangeLog b/ChangeLog
index b844b727c3211c01cd90c00ca0fe56f5d9fe00c5..fea58e7aa06de3e11f71f1e4e331c27ac66ab52f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-25  Charles Wilson  <cygwin@cwilson.fastmail.fm>
+
+       * ltmain.in (link mode): add foo/bin for every foo/lib in
+       dllsearchpath when creating wrapper script.  Fixes
+       build-relink2 test failure.
+       Backport of CVS HEAD 2004-10-13.
+
 2005-11-25  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        * libtool.m4 [aix] <archive_expsym_cmds>

diff --git a/ltmain.in b/ltmain.in
index 1bd4dbbe13cdca7d20fc12e8c3bc114c20b36f35..44faae60984155701f5daf89eb32437478ad7c38 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -1472,10 +1472,15 @@ EOF
        esac
        case $host in
        *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+         testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
          case :$dllsearchpath: in
          *":$dir:"*) ;;
          *) dllsearchpath="$dllsearchpath:$dir";;
          esac
+         case :$dllsearchpath: in
+         *":$testbindir:"*) ;;
+         *) dllsearchpath="$dllsearchpath:$testbindir";;
+         esac
          ;;
        esac
        continue
@@ -4298,10 +4303,15 @@ EOF
        fi
        case $host in
        *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+         testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
          case :$dllsearchpath: in
          *":$libdir:"*) ;;
          *) dllsearchpath="$dllsearchpath:$libdir";;
          esac
+         case :$dllsearchpath: in
+         *":$testbindir:"*) ;;
+         *) dllsearchpath="$dllsearchpath:$testbindir";;
+         esac
          ;;
        esac
       done