From aa4ad131b594358fbbc17e700eca544d9e718b1b Mon Sep 17 00:00:00 2001
From: Stepan Kasal <kasal@ucw.cz>
Date: Thu, 6 Apr 2006 11:33:52 +0000
Subject: [PATCH] * lib/autoconf/general.m4 (_AC_INIT_HELP): Remove the broken
 support   for --help from Cygnus `configure.'

---
 ChangeLog               | 5 +++++
 lib/autoconf/general.m4 | 5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 936a5102..6be7b1c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-06  Stepan Kasal  <kasal@ucw.cz>
+
+	* lib/autoconf/general.m4 (_AC_INIT_HELP): Remove the broken support
+	  for --help from Cygnus `configure.'
+
 2006-04-06  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* doc/autoconf.texi (C Compiler): Warn about #error.  Follows up
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 29e92fcc..0c6956e1 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1061,16 +1061,13 @@ if test "$ac_init_help" = "recursive"; then
     test -d $ac_dir || continue
     _AC_SRCDIRS(["$ac_dir"])
     cd $ac_dir || { ac_status=$?; continue; }
-    # Check for guested configure; otherwise get Cygnus style configure.
+    # Check for guested configure.
     if test -f $ac_srcdir/configure.gnu; then
       echo &&
       $SHELL $ac_srcdir/configure.gnu  --help=recursive
     elif test -f $ac_srcdir/configure; then
       echo &&
       $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.in; then
-      echo &&
-      $ac_configure --help
     else
       AC_MSG_WARN([no configuration information is in $ac_dir])
     fi || ac_status=$?