From c54f2972ec6db5689a5ba9a4e05c2499b81929de Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Tue, 13 Aug 1996 05:38:50 +0000
Subject: [PATCH] Another bug fix

---
 ChangeLog          |  3 +++
 TODO               |  3 +++
 automake.in        |  4 +++-
 tests/ChangeLog    |  2 ++
 tests/Makefile.am  |  2 +-
 tests/Makefile.in  |  4 ++--
 tests/libobj2.test | 30 ++++++++++++++++++++++++++++++
 7 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100755 tests/libobj2.test

diff --git a/ChangeLog b/ChangeLog
index f94d2568..030a2364 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Mon Aug 12 10:28:46 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+	* automake.in (require_file_internal): Special-case `.' when
+	finding files to distribute.  Test libobj2.test.
+
 	* aclocal.in (add_file): Fixed regexp for matching AC_DEFUN.  Test
 	order.test.
 
diff --git a/TODO b/TODO
index 9f5a2708..c67dd43e 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,9 @@
 Priorities for release:
   [ none ]
 
+!! Must fix require_file stuff.  It is really gross, and I don't
+   understand it any more.
+
 ** when can aclocal.m4 be auto-generated?
 
 ** many requests for a way to omit a file from the distribution.
diff --git a/automake.in b/automake.in
index c921c5e0..fac9d5cd 100755
--- a/automake.in
+++ b/automake.in
@@ -3396,7 +3396,9 @@ sub require_file_internal
 	    if (-f $fullfile)
 	    {
 		$found_it = 1;
-		&push_dist_common ($file) if $dir eq $relative_dir;
+		# FIXME Once again, special-case `.'.
+		&push_dist_common ($file)
+		    if $dir eq $relative_dir || $dir eq '.';
 		$save_dir = $dir;
 		last;
 	    }
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 5f836ccc..f2ade8ed 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,7 @@
 Mon Aug 12 13:58:55 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+	* libobj2.test: New file.
+
 	* order.test: New file.
 
 Sun Aug 11 00:10:42 1996  Tom Tromey  <tromey@creche.cygnus.com>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0fe8e531..430d1a4e 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
+order.test libobj2.test
 
 EXTRA_DIST = defs $(TESTS)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 28bed3a3..76fb31cb 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1c from Makefile.am
+# Makefile.in generated automatically by automake 1.1d from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -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
+order.test libobj2.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(top_srcdir)/mkinstalldirs
diff --git a/tests/libobj2.test b/tests/libobj2.test
new file mode 100755
index 00000000..85f8d89e
--- /dev/null
+++ b/tests/libobj2.test
@@ -0,0 +1,30 @@
+#! /bin/sh
+
+# Test to make sure LIBOBJS works in subdirs.
+# Bug from Josh MacDonald.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+PACKAGE=nonesuch
+VERSION=nonesuch
+AC_ARG_PROGRAM
+AC_PROG_INSTALL
+AC_PROG_RANLIB
+LIBOBJS="$LIBOBJS fsusage.o"
+AC_OUTPUT(subdir/Makefile)
+END
+
+mkdir subdir
+
+cat > subdir/Makefile.am << 'END'
+noinst_LIBRARIES = tu
+tu_SOURCES =
+tu_LIBADD = @LIBOBJS@
+END
+
+: > subdir/fsusage.c
+
+$AUTOMAKE || exit 1
+
+grep 'fsusage\.c' subdir/Makefile.in
-- 
2.43.5