From: Thomas Tanner <tanner@gmx.de>
Date: Mon, 5 Apr 1999 10:20:57 +0000 (+0000)
Subject: * demo/run.test: removed the unnecessary test
X-Git-Tag: release-1-3b~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2706767e2c27d8025cf26dca04f1e97bfa25617f;p=thirdparty%2Flibtool.git

* 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 8e524f4d4..af24ba912 100644
--- 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 893d10dac..0ab85a9a5 100644
--- 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 4f428003d..a170f766b 100644
--- 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.