* demo/run.test: removed the unnecessary test

* demo/Makefile.am: ditto
* ltmain.in: set the DLL search path on cygwin,mingw and os2

diff --git a/ChangeLog b/ChangeLog
index 8e524f4d4ae0db93a34f645185eb889a7f638ee4..af24ba912f810badf9df0838b99eda5117798840 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-04-05 Thomas Tanner  <tanner@gmx.de>
+
+       * demo/run.test: removed the unnecessary test
+       * demo/Makefile.am: ditto
+       * ltmain.in: set the DLL search path on cygwin,mingw and os2
+
 1999-04-04  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
        * ltconfig.in (sunos4*, GNU ld): -Bstatic is not enough for

diff --git a/demo/Makefile.am b/demo/Makefile.am
index 893d10dac5b7f9c82979a75ca1cab321167268cc..0ab85a9a50f961a43faa0f2f4ce25d811d4de1bc 100644 (file)
--- a/demo/Makefile.am
+++ b/demo/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = no-dependencies foreign
 
-EXTRA_DIST = $(TESTS) acinclude.m4
+EXTRA_DIST = acinclude.m4
 
 # Build a libtool library, libhello.la for installation in libdir.
 lib_LTLIBRARIES = libhello.la
@@ -62,8 +62,6 @@ CLEANFILES = $(hardcode_tests)
 # to its private directory.
 objdir = `sed -n -e 's/^objdir=\(.*\)$$/\1/p' ../libtool`
 
-TESTS = run.test
-
 # The following rules are only for the libtool demo and tests.
 # Regenerate our acinclude.m4 only if it doesn't exist.
 $(srcdir)/acinclude.m4:

diff --git a/ltmain.in b/ltmain.in
index 4f428003d6ae88cb9ea16c89f1ad391bb3bd4f38..a170f766b8e14827d91cd58c2992c531a68e6088 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -794,6 +794,7 @@ compiler."
     old_convenience=
     deplibs=
     linkopts=
+    dllsearchpath=
     lib_search_path=`pwd`
 
     avoid_version=no
@@ -1019,6 +1020,14 @@ compiler."
          lib_search_path="$lib_search_path $dir"
          ;;
        esac
+       case "$host" in
+       *-*-cygwin* | *-*-mingw* | *-*-os2*)
+         case ":$dllsearchpath:" in
+         *":$dir:"*) ;;
+         *) dllsearchpath="$dllsearchpath:$dir";;
+         esac
+         ;;
+       esac
        continue
        ;;
 
@@ -2918,6 +2927,14 @@ EOF
          *) perm_rpath="$perm_rpath $libdir" ;;
          esac
        fi
+       case "$host" in
+       *-*-cygwin* | *-*-mingw* | *-*-os2*)
+         case ":$dllsearchpath:" in
+         *":$libdir:"*) ;;
+         *) dllsearchpath="$dllsearchpath:$libdir";;
+         esac
+         ;;
+       esac
       done
       # Substitute the hardcoded libdirs into the rpath.
       if test -n "$hardcode_libdir_separator" &&
@@ -3420,6 +3437,14 @@ else
 "
        fi
 
+       # fixup the dll searchpath if we need to.
+       if test -n "$dllsearchpath"; then
+         $echo >> $output "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+       fi
+
        $echo >> $output "\
     if test \"\$libtool_execute_magic\" != \"$magic\"; then
       # Run the actual program with our arguments.