From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Sun, 17 Jan 1999 05:44:56 +0000 (+0000)
Subject: 	* ltmain.in (dlpredeps): append dependencies from dlopened modules
X-Git-Tag: automake_1-4~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77d2b6319c63681bb4459a678c48ed6cdffb3154;p=thirdparty%2Flibtool.git

	* ltmain.in (dlpredeps): append dependencies from dlopened modules
	(but not dlpreopened ones) after all explicitly linked libraries
---

diff --git a/ChangeLog b/ChangeLog
index ca7ebf521..72e6a7f4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-01-17  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+	* ltmain.in (dlpredeps): append dependencies from dlopened modules 
+	(but not dlpreopened ones) after all explicitly linked libraries
+
 	* ltconfig.in (need_lib_prefix, need_version,
  	deplibs_check_method): default to unknown, so that we're
  	remembered that this needs porting; unknown is interpreted as yes,
diff --git a/ltmain.in b/ltmain.in
index 1388ba680..6bc9b8b72 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -616,6 +616,7 @@ compiler."
     avoid_versioning=no
     dlfiles=
     dlprefiles=
+    dlpredeps=
     export_dynamic=no
     export_symbols=
     generated=
@@ -977,8 +978,7 @@ compiler."
 	  else
 	    # We should not create a dependency on this library, but we
 	    # may need any libraries it requires.
-	    compile_command="$compile_command$dependency_libs"
-	    finalize_command="$finalize_command$dependency_libs"
+	    dlpredeps="$dlpredeps$dependency_libs"
 	    prev=
 	    continue
 	  fi
@@ -2040,6 +2040,10 @@ lt_preloaded_symbols[] =
 	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
 	finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
 
+	# Append dependencies from dlopened modules
+	compile_command="$compile_command$dlpredeps"
+	finalize_command="$finalize_command$dlpredeps"
+
 	# We have no uninstalled library dependencies, so finalize right now.
 	$show "$compile_command"
 	$run eval "$compile_command"
@@ -2050,6 +2054,10 @@ lt_preloaded_symbols[] =
       compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
       finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'T%g'`
 
+      # Append dependencies from dlopened modules
+      compile_command="$compile_command$dlpredeps"
+      finalize_command="$finalize_command$dlpredeps"
+
       # Create the binary in the object directory, then wrap it.
       if test ! -d $output_objdir; then
 	$show "$mkdir $output_objdir"