From 4434926bd31154158d82d6dcec4e47e60596cba2 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 6 Sep 1996 04:56:32 +0000
Subject: [PATCH] More error checking

---
 ChangeLog          |  1 +
 TODO               |  3 +++
 automake.in        |  5 +++++
 tests/ChangeLog    |  4 ++++
 tests/Makefile.am  |  2 +-
 tests/Makefile.in  |  2 +-
 tests/libobj3.test | 14 ++++++++++++++
 7 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100755 tests/libobj3.test

diff --git a/ChangeLog b/ChangeLog
index 8ba0c53d..75f777a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 Thu Sep  5 09:06:23 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
 	* automake.in (usage): Include bug-reporting information.
+	(handle_lib_objects): Error if LIBOBJS seen but never set.
 
 	* aclocal.in ($acdir): Use @datadir@/aclocal.
 	(usage): Include bug-reporting information.
diff --git a/TODO b/TODO
index fe12ec4b..39811c7a 100644
--- a/TODO
+++ b/TODO
@@ -351,6 +351,9 @@ document variable scanning: $() and ${} interpolation
 
 document --build-dir
 
+document the fact that you can re-run automake (s/ args) to get back
+into a "maintainer" mode (auto-dependencies)
+
 ================================================================
 
 Libraries:
diff --git a/automake.in b/automake.in
index 29ad2f51..931abc9a 100755
--- a/automake.in
+++ b/automake.in
@@ -890,6 +890,11 @@ sub handle_lib_objects
 	# means adding entries to dep_files.
 	if ($lsearch eq '@LIBOBJS@')
 	{
+	    if (! keys %libsources)
+	    {
+		&am_line_error ($var, "\@LIBOBJS\@ seen but never set in \`configure.in'");
+	    }
+
 	    local ($iter, $rewrite);
 	    foreach $iter (keys %libsources)
 	    {
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 6b894589..93f3cd0a 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep  5 22:54:26 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+	* libobj3.test: New file.
+
 Tue Sep  3 20:57:38 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
 	* block.test: New file.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 89201fa9..5d78e9e5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,6 +13,6 @@ yacc.test mkinstall2.test texinfo2.test ansi.test depacl.test depacl2.test \
 error.test colon.test vtexi2.test tags.test comment.test libfiles.test \
 man.test info.test obsolete.test lex.test scripts.test subdir2.test \
 exsource.test canon4.test dup.test defun.test cxxlink.test cxxnoc.test \
-order.test libobj2.test interp.test alllib.test block.test
+order.test libobj2.test interp.test alllib.test block.test libobj3.test
 
 EXTRA_DIST = defs $(TESTS)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 23adbd70..9e0842cf 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -51,7 +51,7 @@ yacc.test mkinstall2.test texinfo2.test ansi.test depacl.test depacl2.test \
 error.test colon.test vtexi2.test tags.test comment.test libfiles.test \
 man.test info.test obsolete.test lex.test scripts.test subdir2.test \
 exsource.test canon4.test dup.test defun.test cxxlink.test cxxnoc.test \
-order.test libobj2.test interp.test alllib.test block.test
+order.test libobj2.test interp.test alllib.test block.test libobj3.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(top_srcdir)/mkinstalldirs
diff --git a/tests/libobj3.test b/tests/libobj3.test
new file mode 100755
index 00000000..1220e771
--- /dev/null
+++ b/tests/libobj3.test
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+# Test to make sure LIBOBJS actually set in configure.in if seen.
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = tu
+tu_SOURCES =
+tu_LIBADD = @LIBOBJS@
+END
+
+$AUTOMAKE && exit 1
+exit 0
-- 
2.43.5