diff --git a/ChangeLog b/ChangeLog
index 813c6668..f5eae430 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-09-18  Rüdiger Kuhlmann <autoconf-list@ruediger-kuhlmann.de>
+
+	* acgeneral.m4 (_AC_OUTPUT_SUBDIRS): Check for configure.gnu
+	as well.
+	(_AC_INIT_HELP): Likewise.
+	(NEWS): Note checking for configure.gnu.
+	* doc/autoconf.texi: Document checking for configure.gnu when
+	recursing subdirectories.
+
 2000-09-18  Jim Meyering  <meyering@lucent.com>
 
 	* acfunctions.m4 (AC_FUNC_GETLOADAVG): Restore the initial value
diff --git a/NEWS b/NEWS
index 22dc1d3c..0ca085ec 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,10 @@ For autoconf, autoreconf, autoupdate, autoheader, autoscan and ifnames.
 - --warnings
   Specify what category of warnings should be enabled.
 
+- When recursing into subdirectories, try for configure.gnu before
+  configure to adapt for packages not using autoconf on case-insensitive
+  filesystems.
+
 ** autoupdate
 autoupdate is much more powerful, and is able to provide the glue code
 which might be needed to move from an old macro to its newer
diff --git a/acgeneral.m4 b/acgeneral.m4
index 5ef0351c..4de6c09b 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1812,7 +1812,10 @@ if test "$ac_init_help" = "recursive"; then
     esac
 
     # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_sub_srcdir/configure; then
+    if test -f $ac_sub_srcdir/configure.gnu; then
+      echo
+      $SHELL $ac_sub_srcdir/configure.gnu  --help=recursive
+    elif test -f $ac_sub_srcdir/configure; then
       echo
       $SHELL $ac_sub_srcdir/configure  --help=recursive
     elif test -f $ac_sub_srcdir/configure.in; then
@@ -5217,7 +5220,9 @@ AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
     esac
 
     # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_sub_srcdir/configure; then
+    if test -f $ac_sub_srcdir/configure.gnu; then
+      ac_sub_configure="$SHELL $ac_sub_srcdir/configure.gnu"
+    elif test -f $ac_sub_srcdir/configure; then
       ac_sub_configure="$SHELL $ac_sub_srcdir/configure"
     elif test -f $ac_sub_srcdir/configure.in; then
       ac_sub_configure=$ac_configure
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 929d3dd0..f6e348cd 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -2376,9 +2376,13 @@ fi
 
 If a given @var{dir} is not found, no error is reported, so a
 @code{configure} script can configure whichever parts of a large source
-tree are present.  If a given @var{dir} contains @file{configure.in} but
-no @code{configure}, the Cygnus @code{configure} script found by
-@code{AC_CONFIG_AUXDIR} is used.
+tree are present.  If a given @var{dir} contains @code{configure.gnu},
+it is run instead of @code{configure}. This is for packages that might
+use a non-autoconf script @code{Configure}, which can't be called
+through a wrapper @code{configure} since it would be the same file on
+case-insensitive filesystems. Likewise, if a @var{dir} contains
+@file{configure.in} but no @code{configure}, the Cygnus @code{configure}
+script found by @code{AC_CONFIG_AUXDIR} is used.
 
 The subdirectory @code{configure} scripts are given the same command
 line options that were given to this @code{configure} script, with minor
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 5ef0351c..4de6c09b 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1812,7 +1812,10 @@ if test "$ac_init_help" = "recursive"; then
     esac
 
     # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_sub_srcdir/configure; then
+    if test -f $ac_sub_srcdir/configure.gnu; then
+      echo
+      $SHELL $ac_sub_srcdir/configure.gnu  --help=recursive
+    elif test -f $ac_sub_srcdir/configure; then
       echo
       $SHELL $ac_sub_srcdir/configure  --help=recursive
     elif test -f $ac_sub_srcdir/configure.in; then
@@ -5217,7 +5220,9 @@ AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
     esac
 
     # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_sub_srcdir/configure; then
+    if test -f $ac_sub_srcdir/configure.gnu; then
+      ac_sub_configure="$SHELL $ac_sub_srcdir/configure.gnu"
+    elif test -f $ac_sub_srcdir/configure; then
       ac_sub_configure="$SHELL $ac_sub_srcdir/configure"
     elif test -f $ac_sub_srcdir/configure.in; then
       ac_sub_configure=$ac_configure