For PR automake/243:

	* m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Strip everything
	after `:'.
	* tests/Makefile.am (TESTS): Added pr243.test.
	* tests/pr243.test: New file.

diff --git a/ChangeLog b/ChangeLog
index bd03a8d00fd9a6c1057298c47a0cbf249727183c..611d3a322b59b46a7028830657ccb597d3101391 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,16 @@
 2001-12-30  Tom Tromey  <tromey@redhat.com>
 
+       For PR automake/243:
+       * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Strip everything
+       after `:'.
+       * tests/Makefile.am (TESTS): Added pr243.test.
+       * tests/pr243.test: New file.
+
        For PR automake/220:
        * tests/Makefile.am (TESTS): Added pr220.test.
        * tests/pr220.test: New file.
-       * m4/cond.m4 (AM_CONDITIONAL): Cause config.status to fail if
-       conditional was never run.
+       * m4/cond.m4 (AM_CONDITIONAL): Cause creation of config.status to
+       fail if conditional was never run.
 
        For PR automake/260:
        * lib/depcomp (tru64): Correctly handle libtool case.

diff --git a/m4/depout.m4 b/m4/depout.m4
index e44ceb702a4f1c0ba0191a0aa1ae926d2697ae52..bb457380a591e6d960474330c833ac0a251019d4 100644 (file)
--- a/m4/depout.m4
+++ b/m4/depout.m4
@@ -23,6 +23,8 @@
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [for mf in $CONFIG_FILES; do
+  # Strip MF so we end up with the name of the file.
+  mf=`echo "$mf" | sed -e 's/:.*$//'`
   if (head -1 $mf | fgrep 'generated by automake') > /dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f5d82ec4624967cf2e60461c28aef57b430d6fbd..ee504194376cf1b3dad1cb9adfe5a8085dfe52dc 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -240,6 +240,7 @@ pluseq8.test \
 ppf77.test \
 pr2.test \
 pr220.test \
+pr243.test \
 pr266.test \
 pr279.test \
 pr279-2.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 32266a2f8768eb845625922c43fb1607db57a2be..5a359007b2d2568ec64f2e307a49d25aaed5f47d 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -313,6 +313,7 @@ pluseq8.test \
 ppf77.test \
 pr2.test \
 pr220.test \
+pr243.test \
 pr266.test \
 pr279.test \
 pr279-2.test \

diff --git a/tests/pr243.test b/tests/pr243.test
new file mode 100755 (executable)
index 0000000..3ff6550
--- /dev/null
+++ b/tests/pr243.test
@@ -0,0 +1,31 @@
+#! /bin/sh
+
+# Test for PR 243.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+AC_INIT(foo, 0.1, dev@null)
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AC_PROG_CC
+AM_CONDITIONAL(FOOTEST, false)
+AC_CONFIG_FILES(Makefile:Makefile.in:tail.mk)
+AC_OUTPUT
+END
+
+: > tail.mk
+
+cat > Makefile.am << 'END'
+include_HEADERS         = 3dfx.h linutil.h
+noinst_HEADERS          = fx64.h fxdll.h fximg.h fxglob.h \
+                          fxos.h fxver.h glob.h
+noinst_PROGRAMS = fxmisc
+fxmisc_SOURCES    = fx64.c fximg.c fxos.c linutil.c
+END
+
+$ACLOCAL || exit 1
+$AUTOMAKE || exit 1
+$AUTOCONF || exit 1
+./configure || exit 1
+
+test -f .deps/fx64.Po