From 60aed55d95cb351f53b7e249c140c84e5660c663 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 30 Dec 2001 20:29:14 +0000 Subject: [PATCH] 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. --- ChangeLog | 10 ++++++++-- m4/depout.m4 | 2 ++ tests/Makefile.am | 1 + tests/Makefile.in | 1 + tests/pr243.test | 31 +++++++++++++++++++++++++++++++ 5 files changed, 43 insertions(+), 2 deletions(-) create mode 100755 tests/pr243.test diff --git a/ChangeLog b/ChangeLog index bd03a8d0..611d3a32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,16 @@ 2001-12-30 Tom Tromey + 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 e44ceb70..bb457380 100644 --- 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 f5d82ec4..ee504194 100644 --- 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 32266a2f..5a359007 100644 --- 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 index 00000000..3ff65502 --- /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 -- 2.43.5