From 4c3c671534a69b0896c5fd1aa0f52d7735d98e9f Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 8 Mar 1998 22:44:42 +0000 Subject: [PATCH] AC_OUTPUT ":" syntax patch --- ChangeLog | 6 ++++++ THANKS | 1 + automake.in | 2 +- tests/ChangeLog | 4 ++++ tests/Makefile.am | 2 +- tests/Makefile.in | 2 +- tests/colon4.test | 26 ++++++++++++++++++++++++++ 7 files changed, 40 insertions(+), 3 deletions(-) create mode 100755 tests/colon4.test diff --git a/ChangeLog b/ChangeLog index 6c370765..a7bf1dfc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Mar 8 15:43:09 1998 Tom Tromey + + * automake.in (handle_configure): When recognizing AC_OUTPUT ":" + syntax, make regexp less greedy. From Maciej W. Rozycki. Test + colon4.test. + Fri Mar 6 21:20:53 1998 Tom Tromey * m4/exeext.m4 (AM_EXEEXT): Ignore am_c_test.o. From Bruno diff --git a/THANKS b/THANKS index 9fa1f585..2d179339 100644 --- a/THANKS +++ b/THANKS @@ -39,6 +39,7 @@ Joshua Cowan jcowan@jcowan.reslife.okstate.edu Juergen A. Erhard jae@laden.ilk.de Karl Berry kb@cs.umb.edu Kevin Dalley kevin@aimnet.com +Maciej W. Rozycki macro@ds2.pg.gda.pl Marius Vollmer mvo@zagadka.ping.de Mark Eichin eichin@cygnus.com Mark Galassi rosalia@nis.lanl.gov diff --git a/automake.in b/automake.in index 49ad8726..5acc4800 100755 --- a/automake.in +++ b/automake.in @@ -3157,7 +3157,7 @@ sub handle_configure local ($need_rewritten); foreach $file (@other_input_files) { - if ($file =~ /^(.*):(.*)$/) + if ($file =~ /^([^:]*):(.*)$/) { # This is the ":" syntax of AC_OUTPUT. $file = $1; diff --git a/tests/ChangeLog b/tests/ChangeLog index 1a85d626..1acee445 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +Sun Mar 8 15:35:14 1998 Tom Tromey + + * colon4.test: New file. + Fri Mar 6 21:17:10 1998 Tom Tromey * colon3.test: Refined tests. diff --git a/tests/Makefile.am b/tests/Makefile.am index 97e18a6d..3f2dcf23 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -28,7 +28,7 @@ stamph.test ldadd.test version2.test conf2.test cond.test cond2.test \ xsource.test libobj6.test depend3.test output5.test ammissing.test \ install.test libobj7.test objc.test cond3.test cxxcpp.test \ aclocal.test alpha.test whoami.test unused.test condman.test \ -texinfo5.test aclocali.test texinfo6.test condman2.test +texinfo5.test aclocali.test texinfo6.test condman2.test colon4.test EXTRA_DIST = defs $(TESTS) diff --git a/tests/Makefile.in b/tests/Makefile.in index 5c34e0ed..8831e98f 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -89,7 +89,7 @@ stamph.test ldadd.test version2.test conf2.test cond.test cond2.test \ xsource.test libobj6.test depend3.test output5.test ammissing.test \ install.test libobj7.test objc.test cond3.test cxxcpp.test \ aclocal.test alpha.test whoami.test unused.test condman.test \ -texinfo5.test aclocali.test texinfo6.test condman2.test +texinfo5.test aclocali.test texinfo6.test condman2.test colon4.test EXTRA_DIST = defs $(TESTS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/tests/colon4.test b/tests/colon4.test new file mode 100755 index 00000000..c94059de --- /dev/null +++ b/tests/colon4.test @@ -0,0 +1,26 @@ +#! /bin/sh + +# Make sure ":" works with files automake generates. +# This test is for multiple ":"s. +# Test from Maciej W. Rozycki. + +. $srcdir/defs || exit 1 + +cat > configure.in << 'END' +PACKAGE=nonesuch +VERSION=nonesuch +AC_ARG_PROGRAM +AC_PROG_INSTALL +AC_OUTPUT(Makefile zardoz:one:two:three) +END + +: > Makefile.am +: > one +: > two +: > three + +$AUTOMAKE || exit 1 + +# The rule should regenerate the file "zardoz". +grep '^zardoz:one:two' Makefile.in && exit 1 +exit 0 -- 2.43.5