+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
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
local ($need_rewritten);
foreach $file (@other_input_files)
{
- if ($file =~ /^(.*):(.*)$/)
+ if ($file =~ /^([^:]*):(.*)$/)
{
# This is the ":" syntax of AC_OUTPUT.
$file = $1;
+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.
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)
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
--- /dev/null
+#! /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