Re: Small bug in status.m4?

[Noah Misch]

On Wed, Apr 13, 2005 at 10:01:52AM -0700, Paul Eggert wrote:
> 2005-04-13  Paul Eggert  <address@hidden>
> 
>       * lib/autoconf/status.m4 (_AC_OUTPUT_SUBDIRS): Look for configure.ac
>       as well as configure.in.  Problem reported by Gregorio Guidi.
> 
> --- status.m4.~1.50.~ 2005-03-22 16:27:10 -0800
> +++ status.m4 2005-04-13 09:56:51 -0700
> @@ -1142,7 +1142,8 @@ 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.in; then
> +    elif test -f $ac_srcdir/configure.ac ||
> +      test -f $ac_srcdir/configure.in; then
>        ac_sub_configure=$ac_configure
>      else
>        AC_MSG_WARN([no configuration information is in $ac_dir])

`configure' looks for `configure.in' in an AC_CONFIG_SUBDIRS subdirectory as
evidence of Cygnus-style configure.  It need not check `configure.ac' as well.
This patch reverts the above change and fixes a similar error in general.m4.

Ok?


2006-04-02  Noah Misch  <address@hidden>

        * 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.

diff -urp -X dontdiff ac-clean/lib/autoconf/general.m4 
ac-cygnus_conf/lib/autoconf/general.m4
--- ac-clean/lib/autoconf/general.m4    2006-04-02 11:27:39.000000000 -0400
+++ ac-cygnus_conf/lib/autoconf/general.m4      2006-04-02 17:55:05.000000000 
-0400
@@ -1068,8 +1068,7 @@ if test "$ac_init_help" = "recursive"; t
     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 -urp -X dontdiff ac-clean/lib/autoconf/status.m4 
ac-cygnus_conf/lib/autoconf/status.m4
--- ac-clean/lib/autoconf/status.m4     2006-03-27 12:42:18.000000000 -0500
+++ ac-cygnus_conf/lib/autoconf/status.m4       2006-04-02 17:55:18.000000000 
-0400
@@ -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])