From: Tom Tromey <tromey@redhat.com>
Date: Thu, 25 Mar 1999 17:52:47 +0000 (+0000)
Subject: 1999-03-25  Alexandre Oliva  <oliva@dcc.unicamp.br>
X-Git-Tag: user-dep-gen-branchpoint~11
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=2a1cbe3a71aa1e7dfe892b4b35ad0d6f53dc3ea8;p=automake.git

1999-03-25  Alexandre Oliva  <oliva@dcc.unicamp.br>
	* automake.in (LDADD): accept -dlopen and -dlpreopen here
	* automake.texi: ditto
---

diff --git a/ChangeLog b/ChangeLog
index 520742e6..84fe16c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-03-25  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+	* automake.in (LDADD): accept -dlopen and -dlpreopen here
+	* automake.texi: ditto
+
 1999-03-25  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
 	* automake.in (TESTS): make from Solaris 7/x86 loses if srcdir
diff --git a/automake.in b/automake.in
index f5cebcbe..085159fd 100755
--- a/automake.in
+++ b/automake.in
@@ -1300,6 +1300,8 @@ sub handle_lib_objects_cond
 	{
 	    if ($var =~ /^(.*)LDADD$/)
 	    {
+		# Skip -dlopen and -dlpreopen; these are explicitly allowed.
+		next if $lsearch =~ /^-dl(pre)?open$/;
 		&am_line_error ($var, "linker flags such as \`$lsearch' belong in \`${1}LDFLAGS");
 	    }
 	    else
diff --git a/automake.texi b/automake.texi
index d7d31974..6e5c959e 100644
--- a/automake.texi
+++ b/automake.texi
@@ -1619,8 +1619,9 @@ rmt_SOURCES = @dots{}
 @cindex _LDFLAGS, defined
 
 @samp{@var{prog}_LDADD} is inappropriate for passing program-specific
-linker flags (except for @samp{-l} and @samp{-L}).  So, use the
-@samp{@var{prog}_LDFLAGS} variable for this purpose.
+linker flags (except for @samp{-l}, @samp{-L}, @samp{-dlopen} and
+@samp{-dlpreopen}).  So, use the @samp{@var{prog}_LDFLAGS} variable for
+this purpose.
 @vindex _LDFLAGS
 
 @cindex _DEPENDENCIES, defined
@@ -1634,10 +1635,11 @@ done.
 If @samp{@var{prog}_DEPENDENCIES} is not supplied, it is computed by
 Automake.  The automatically-assigned value is the contents of
 @samp{@var{prog}_LDADD}, with most configure substitutions, @samp{-l},
-and @samp{-L} options removed.  The configure substitutions that are
-left in are only @samp{@@LIBOBJS@@} and @samp{@@ALLOCA@@}; these are
-left because it is known that they will not cause an invalid value for
-@samp{@var{prog}_DEPENDENCIES} to be generated.
+@samp{-L}, @samp{-dlopen} and @samp{-dlpreopen} options removed.  The
+configure substitutions that are left in are only @samp{@@LIBOBJS@@} and
+@samp{@@ALLOCA@@}; these are left because it is known that they will not
+cause an invalid value for @samp{@var{prog}_DEPENDENCIES} to be
+generated.
 
 
 @node A Library, LIBOBJS, A Program, Programs