From: Gary V. Vaughan <gary@gnu.org>
Date: Sun, 25 Jul 2004 20:36:43 +0000 (+0000)
Subject: * ltmain.in: Make sure that dependency libraries of -dlpreopened
X-Git-Tag: release-1-9b~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54fafb6fa75913dec90b3e1e2904e0918e19ad24;p=thirdparty%2Flibtool.git

* ltmain.in: Make sure that dependency libraries of -dlpreopened
libraries are propogated properly.
---

diff --git a/ChangeLog b/ChangeLog
index 70a4d9f74..05c7bb0ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,20 @@
+2004-07-25  Gary V. Vaughan  <gary@gnu.org>
+
+	* ltmain.in: Make sure that dependency libraries of -dlpreopened
+	libraries are propogated properly.
+
 2004-07-23  Joe Orton  <joe@manyfish.co.uk>
 
-	* libtool.m4: Treat bsdi5* like bsdi4*. 
+	* libtool.m4: Treat bsdi5* like bsdi4*.
 
 2004-07-22  Peter O'Gorman  <peter@pogma.com>
 
 	* ltmain.in [darwin](func_extract_archives): $SED not sed.
-	
+
 	* ltmain.in [darwin](func_extract_archives): Clean up last commit
 	a little, some suggestions are from Albert Chin, those that are
 	broken are mine.
-	
+
 	* libltdl/Makefile.am, libltdl/loaders/Makefile.am: Look for
 	included files in the right places.
 
@@ -29,7 +34,7 @@
 2004-07-18  Peter O'Gorman  <peter@pogma.com>
 
 	* libltdl/Makefile.am: Ensure that lt__dirent.h is part of the dist,
-	also make failed looking for configure.ac, look for 
+	also make failed looking for configure.ac, look for
 	$(top_srcdir)/configure.ac instead.
 
 2004-07-15  Gary V. Vaughan  <gary@gnu.org>
diff --git a/configure.ac b/configure.ac
index 73a1b6848..c920fe1a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ(2.58) ## We use AS_HELP_STRING
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([libtool], [1.5a], [bug-libtool@gnu.org])
+AC_INIT([libtool], [1.5b], [bug-libtool@gnu.org])
 AC_CONFIG_HEADERS([config.h:config-h.in])
 AC_CONFIG_SRCDIR([ltmain.in])
 AC_CONFIG_AUX_DIR([config])
diff --git a/ltmain.in b/ltmain.in
index 88045efb7..aedcd4a28 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -2232,6 +2232,20 @@ EOF
 	esac
       fi
       if test "$linkmode,$pass" = "lib,dlpreopen"; then
+        # Collect and forward deplibs of preopened libtool libs
+	for lib in $dlprefiles; do
+	  # Ignore non-libtool-libs
+	  case $lib in
+	  */*.la | *\\*.la)
+	    . $lib
+	    deplibs="$deplibs $dependency_libs"
+	    ;;
+	  *.la)
+	    . ./$lib
+	    deplibs="$deplibs $dependency_libs"
+	    ;;
+	  esac
+	done
 	libs="$dlprefiles"
       fi
       if test "$pass" = dlopen; then