Fix for PR automake/229:

* tests/pr229.test: New file.
* tests/Makefile.am (TESTS): Add it.
* automake.in (scan_one_autoconf_file): Recognize AC_CYGWIN,
AC_EMXOS2, and AC_MINGW32.

diff --git a/ChangeLog b/ChangeLog
index 410e3a4..5f8d3b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-18  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       Fix for PR automake/229:
+       * tests/pr229.test: New file.
+       * tests/Makefile.am (TESTS): Add it.
+       * automake.in (scan_one_autoconf_file): Recognize AC_CYGWIN,
+       AC_EMXOS2, and AC_MINGW32.
+
 2002-01-18  Tom Tromey  <tromey@redhat.com>
 
        * tests/cond7.test: Fix test bug exposed by copyright update.

diff --git a/THANKS b/THANKS
index 32f30f3..047de32 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -63,6 +63,7 @@ Henrik Frystyk Nielsen        frystyk@w3.org
 Ian Lance Taylor       ian@cygnus.com
 Inoue                  inoue@ainet.or.jp
 James Henstridge       james@daa.com.au
+James Youngman         jay@gnu.org
 Janos Farkas           chexum@shadow.banki.hu
 Jared Davis            abiword@aiksaurus.com
 Jason Molenda          crash@cygnus.co.jp

diff --git a/automake.in b/automake.in
index dda1a00..ff67e62 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -4825,7 +4825,8 @@ sub scan_one_autoconf_file
 
         # Handle AC_CANONICAL_*.  Always allow upgrading to
         # AC_CANONICAL_SYSTEM, but never downgrading.
-       if (/AC_CANONICAL_HOST/ || /AC_CHECK_TOOL/)
+       if (/AC_CANONICAL_HOST/ || /AC_CHECK_TOOL/
+            || /AC_CYGWIN/ || /AC_EMXOS2/ || /AC_MINGW32/)
          {
            if (! $seen_canonical)
              {

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2f5c100..84603d3 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -251,6 +251,7 @@ ppf77.test \
 pr2.test \
 pr211.test \
 pr220.test \
+pr229.test \
 pr243.test \
 pr266.test \
 pr279.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index daa2ffb..c1a6d7e 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -325,6 +325,7 @@ ppf77.test \
 pr2.test \
 pr211.test \
 pr220.test \
+pr229.test \
 pr243.test \
 pr266.test \
 pr279.test \

diff --git a/tests/pr229.test b/tests/pr229.test
new file mode 100755 (executable)
index 0000000..fc0bd85
--- /dev/null
+++ b/tests/pr229.test
@@ -0,0 +1,19 @@
+#! /bin/sh
+
+# Make sure AC_CYGWIN requires config.{sub,guess}.
+# Reported by James Youngman.
+
+. $srcdir/defs || exit 1
+
+set -e
+
+cat >> configure.in <<EOF
+AC_CYGWIN
+EOF
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOMAKE -a
+test -f config.sub
+test -f config.guess