From 09c65d3f926c5019975edcda6090869e9565a8a6 Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Fri, 2 Aug 2002 16:10:28 +0000
Subject: [PATCH] * tests/ext2.test: New file.  This bug is present in Automake
 1.6.3 and was fixed by the change on variable_conditions_permutations and
 invert_conditions on 2002-05-16. * tests/Makefile.am (TESTS): Add ext2.test.
 Reported by Ladislav Strojil.

---
 ChangeLog         |  8 ++++++++
 THANKS            |  1 +
 stamp-vti         |  4 ++--
 tests/Makefile.am |  1 +
 tests/Makefile.in |  1 +
 tests/ext2.test   | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 version.texi      |  4 ++--
 7 files changed, 68 insertions(+), 4 deletions(-)
 create mode 100755 tests/ext2.test

diff --git a/ChangeLog b/ChangeLog
index 366ad88..b3d4528 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-02  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+	* tests/ext2.test: New file.  This bug is present in Automake 1.6.3
+	and was fixed by the change on variable_conditions_permutations
+	and invert_conditions on 2002-05-16.
+	* tests/Makefile.am (TESTS): Add ext2.test.
+	Reported by Ladislav Strojil.
+
 2002-08-01  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
 	* aclocal.in (parse_arguments): Add `dirlist' paths add the
diff --git a/THANKS b/THANKS
index 094ccd6..e503521 100644
--- a/THANKS
+++ b/THANKS
@@ -102,6 +102,7 @@ Kevin Ryde		user42@zip.com.au
 Kevin Street		street@iname.com
 Klaus Reichl		Klaus.Reichl@alcatel.at
 L. Peter Deutsch	ghost@aladdin.com
+Ladislav Strojil	Ladislav.Strojil@seznam.cz
 Larry Jones		larry.jones@sdrc.com
 Lars Hecking		lhecking@nmrc.ucc.ie
 Lars J. Aas		larsa@sim.no
diff --git a/stamp-vti b/stamp-vti
index f808452..14f6563 100644
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 31 July 2002
-@set UPDATED-MONTH July 2002
+@set UPDATED 2 August 2002
+@set UPDATED-MONTH August 2002
 @set EDITION 1.6c
 @set VERSION 1.6c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5f203ea..4701322 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -155,6 +155,7 @@ exeext.test \
 exeext2.test \
 exsource.test \
 ext.test \
+ext2.test \
 extra.test \
 extra3.test \
 extra4.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index d279136..5aab2c7 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -243,6 +243,7 @@ exeext.test \
 exeext2.test \
 exsource.test \
 ext.test \
+ext2.test \
 extra.test \
 extra3.test \
 extra4.test \
diff --git a/tests/ext2.test b/tests/ext2.test
new file mode 100755
index 0000000..34c9ad4
--- /dev/null
+++ b/tests/ext2.test
@@ -0,0 +1,53 @@
+#!/bin/sh
+# Regression test for a bug reported by Ladislav Strojil.
+# Using different extensions for the same language should not
+# output the build rules several times.
+
+. $srcdir/defs
+
+set -e
+
+cat >>configure.in <<EOF
+AC_PROG_CXX
+EOF
+
+cat >Makefile.am <<EOF
+bin_PROGRAMS = p q r
+p_SOURCES = a.cc b.cpp c.cxx
+q_SOURCES = sub/d.cc sub/e.cpp sub/f.cxx
+r_SOURCES = g.cc h.cpp i.cxx
+r_CXXFLAGS = -DFOO
+EOF
+
+$ACLOCAL
+$AUTOMAKE
+
+grep '\.o:' Makefile.in > rules
+cat rules
+
+# Here is a example of bogus output.  The rules are output several
+# times.
+#|  .cc.o:
+#|  d.o: sub/d.cc
+#|  e.o: sub/e.cpp
+#|  f.o: sub/f.cxx
+#|  r-g.o: g.cc
+#|  r-h.o: h.cpp
+#|  r-i.o: i.cxx
+#|  .cpp.o:
+#|  d.o: sub/d.cc
+#|  e.o: sub/e.cpp
+#|  f.o: sub/f.cxx
+#|  r-g.o: g.cc
+#|  r-h.o: h.cpp
+#|  r-i.o: i.cxx
+#|  .cxx.o:
+#|  #d.o: sub/d.cc
+#|  #e.o: sub/e.cpp
+#|  #f.o: sub/f.cxx
+#|  #r-g.o: g.cc
+#|  #r-h.o: h.cpp
+#|  #r-i.o: i.cxx
+
+# Bail out if we find a duplicate.
+$PERL -ne 'if (exists $a{$_}) { exit 1 } else { $a{$_} = 1 }' < rules
diff --git a/version.texi b/version.texi
index f808452..14f6563 100644
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 31 July 2002
-@set UPDATED-MONTH July 2002
+@set UPDATED 2 August 2002
+@set UPDATED-MONTH August 2002
 @set EDITION 1.6c
 @set VERSION 1.6c
-- 
2.7.4