* lib/autoconf/general.m4 (_AC_INIT_HELP): Only `configure.in' evidences

a subdirectory subject to Cygnus `configure'.
* lib/autoconf/status.m4 (_AC_OUTPUT_SUBDIRS): Likewise.

* lib/autoconf/headers.m4 (_AC_CHECK_HEADER_MONGREL): Omit the bug
report request when we have no AC_PACKAGE_BUGREPORT.

diff --git a/ChangeLog b/ChangeLog
index 1314adbba4dba76ff427bac3630090b9678a2a22..39947160de2f74e7a572db3714db1ddcef7869ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-04  Noah Misch  <noah@cs.caltech.edu>
+
+       * lib/autoconf/general.m4 (_AC_INIT_HELP): Only `configure.in' evidences
+       a subdirectory subject to Cygnus `configure'.
+       * lib/autoconf/status.m4 (_AC_OUTPUT_SUBDIRS): Likewise.
+
+       * lib/autoconf/headers.m4 (_AC_CHECK_HEADER_MONGREL): Omit the bug
+       report request when we have no AC_PACKAGE_BUGREPORT.
+
 2006-04-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * THANKS: Update.

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 7cd9915059ad64acfb4b29a86c567b2d773c9b21..71eb84dfb9d8f32d34abb1fc0b10fe304f614c4b 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1068,8 +1068,7 @@ if test "$ac_init_help" = "recursive"; then
     elif test -f $ac_srcdir/configure; then
       echo &&
       $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-          test -f $ac_srcdir/configure.in; then
+    elif test -f $ac_srcdir/configure.in; then
       echo &&
       $ac_configure --help
     else

diff --git a/lib/autoconf/headers.m4 b/lib/autoconf/headers.m4
index 28d831cb6a173c61cd34514d140970286d2ef8f9..70ef955c29ddb72d57d7fd23280b3d9be740a8e6 100644 (file)
--- a/lib/autoconf/headers.m4
+++ b/lib/autoconf/headers.m4
@@ -135,12 +135,9 @@ case $ac_header_compiler:$ac_header_preproc:$ac_[]_AC_LANG_ABBREV[]_preproc_warn
     AC_MSG_WARN([$1:     section "Present But Cannot Be Compiled"])
     AC_MSG_WARN([$1: proceeding with the preprocessor's result])
     AC_MSG_WARN([$1: in the future, the compiler will take precedence])
-    (
-      AS_BOX([Report this to ]m4_ifset([AC_PACKAGE_BUGREPORT],
-                                      [AC_PACKAGE_BUGREPORT],
-                                      [the AC_PACKAGE_NAME lists. ]))
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+    m4_ifset([AC_PACKAGE_BUGREPORT],
+    [( AS_BOX([Report this to ]AC_PACKAGE_BUGREPORT)
+     ) | sed "s/^/$as_me: WARNING:     /" >&2])
     ;;
 esac
 AC_CACHE_CHECK([for $1], ac_Header,

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 7d6a98fce2f4f8e7fe3ae78b4f40a0a2b7d7ed83..7ba7860bd9db197b9dbcc06f860e6780c9ea344c 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -935,8 +935,7 @@ if test "$no_recursion" != yes; then
       ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'"
     elif test -f $ac_srcdir/configure; then
       ac_sub_configure="$SHELL '$ac_srcdir/configure'"
-    elif test -f $ac_srcdir/configure.ac ||
-        test -f $ac_srcdir/configure.in; then
+    elif test -f $ac_srcdir/configure.in; then
       ac_sub_configure=$ac_configure
     else
       AC_MSG_WARN([no configuration information is in $ac_dir])