AC_OUTPUT ":" syntax patch

diff --git a/ChangeLog b/ChangeLog
index 6c3707652a6b4e2f0cf47b9a3e0bc4944a13275f..a7bf1dfce89cfbc8a8dfc943e17f7e047118020e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Mar  8 15:43:09 1998  Tom Tromey  <tromey@cygnus.com>
+
+       * 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  <tromey@cygnus.com>
 
        * m4/exeext.m4 (AM_EXEEXT): Ignore am_c_test.o.  From Bruno

diff --git a/THANKS b/THANKS
index 9fa1f58595d99121e6858efe187e727f5b0ddc72..2d1793393e963a2b0c0ba384d8f2bf3d18b9e1c3 100644 (file)
--- 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 49ad8726b7adcb2033ede4d1330234038231b484..5acc480085923adb0fbe41a550124736dcb889b3 100755 (executable)
--- 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 1a85d626779fbd3996db374dfea46bf6cd49d20d..1acee44527ce9c5c4f04935725f9083508a2d1e1 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Sun Mar  8 15:35:14 1998  Tom Tromey  <tromey@cygnus.com>
+
+       * colon4.test: New file.
+
 Fri Mar  6 21:17:10 1998  Tom Tromey  <tromey@cygnus.com>
 
        * colon3.test: Refined tests.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 97e18a6d74c982363b579c81af7503574912b9d7..3f2dcf230cdd8ebc47dadd94cceac9f8c90994a7 100644 (file)
--- 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 5c34e0ed89ac7de6bd17869c48dbf472b1492a26..8831e98f793c844780b7c7841458db53e192023a 100644 (file)
--- 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 (executable)
index 0000000..c94059d
--- /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