library dependency bug reported by proven

diff --git a/ChangeLog b/ChangeLog
index 2eb634f9c6f2e97e17e6cd32f5d96f93e69af17b..cddebcae3fb19938872378c780a41bc95c740c55 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Sun Apr  5 13:58:24 1998  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_ltlibraries): Examine _DEPENDENCIES
+       variable.  Report from Chris Provenzano.  Test library.test.
+       (handle_libraries): Likewise.
+
        * m4/lex.m4: Allow AM_PROG_LEX to be called with no arguments.
 
 Sun Apr  5 13:54:25 1998  Alexandre Oliva <oliva@dcc.unicamp.br>

diff --git a/THANKS b/THANKS
index 2d5b4b03ca8ebb4c7e3b605903090f0038bd6070..b2494940c06ec04340d67e6510d19f9d60bc2743 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -10,6 +10,7 @@ Anthony Green         green@cygnus.com
 Assar Westerlund       assar@sics.se
 Bernard Urban          Bernard.Urban@meteo.fr
 Bill Fenner            fenner@parc.xerox.com
+Chris Provenzano       proven@io.proven.org
 David A. Swierczek     swiercze@mr.med.ge.com
 David Zaroski          cz253@cleveland.Freenet.Edu
 Dieter Baron           dillo@stieltjes.smc.univie.ac.at

diff --git a/automake.in b/automake.in
index 7a7e87aaa7a064eeb3c34ccf05d79aa1b57fab81..b4fa5246997c7ea23a8866ba3c5f6ec8a67f46d9 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1735,6 +1735,9 @@ sub handle_libraries
                            . $xlib . "_LDADD'");
        }
 
+       # Make sure we at look at this.
+       &examine_variable ($xlib . '_DEPENDENCIES');
+
        &handle_source_transform ($xlib, $onelib, $obj);
 
        $output_rules .=
@@ -1849,6 +1852,9 @@ sub handle_ltlibraries
                            . $xlib . "_LDADD'");
        }
 
+       # Make sure we at look at this.
+       &examine_variable ($xlib . '_DEPENDENCIES');
+
        local ($linker) = &handle_source_transform ($xlib, $onelib, $obj);
 
        # Determine program to use for link.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 08106076a4fb00063935eb8038615f3416d16f87..f49d630f9eaf20ccec2053944eeb30f62c926705 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,7 @@
 Sun Apr  5 15:26:42 1998  Tom Tromey  <tromey@cygnus.com>
 
+       * library.test: New file.
+
        * lex2.test: Updated since lex error changed to warning.
 
 Fri Apr  3 13:04:50 1998  Tom Tromey  <tromey@cygnus.com>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 45f26b439b6a8ca5675d57b094b0f66a4a7aa6f2..eadfd75168027a0344c101cd9a291f7cc5ac58ed 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -31,7 +31,7 @@ aclocal.test alpha.test whoami.test unused.test condman.test \
 texinfo5.test aclocali.test texinfo6.test condman2.test colon4.test \
 java.test sinclude.test javaprim.test javasubst.test aclocalii.test \
 lex2.test libobj8.test version3.test instdata.test exdir2.test \
-colon5.test
+colon5.test library.test
 
 EXTRA_DIST = defs $(TESTS)
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 63477ba166c59beba18dcdaa7207e8ad72528e05..e3c733ae796a5ab9ddb3c2fdf42aac5ea5b97f00 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -94,7 +94,7 @@ aclocal.test alpha.test whoami.test unused.test condman.test \
 texinfo5.test aclocali.test texinfo6.test condman2.test colon4.test \
 java.test sinclude.test javaprim.test javasubst.test aclocalii.test \
 lex2.test libobj8.test version3.test instdata.test exdir2.test \
-colon5.test
+colon5.test library.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

diff --git a/tests/library.test b/tests/library.test
new file mode 100755 (executable)
index 0000000..0dcbcea
--- /dev/null
+++ b/tests/library.test
@@ -0,0 +1,20 @@
+#! /bin/sh
+
+# Test for _DEPENDENCIES with libraries.
+
+. $srcdir/defs || exit 1
+
+cat >> configure.in << 'END'
+AC_PROG_RANLIB
+AM_MAINTAINER_MODE
+AM_EXEEXT
+AC_PROG_CC
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = dejagnu cygnus
+lib_LIBRARIES = libfoo.a
+libfoo_a_DEPENDENCIES = libzot.a
+END
+
+$AUTOMAKE