FYI: 92-configure-ac.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * acgeneral.m4: Last changes for `configure.ac'.
        (_AC_INIT_HELP, _AC_OUTPUT_SUBDIRS): Take `configure.ac' into
        account.
        * autoreconf.sh: Likewise.
        
Index: acgeneral.m4
--- acgeneral.m4 Fri, 22 Dec 2000 18:31:03 +0100 akim (ace/27_acgeneral. 
1.169.8.107 644)
+++ acgeneral.m4 Sat, 23 Dec 2000 11:39:54 +0100 akim (ace/27_acgeneral. 
1.169.8.107 644)
@@ -62,7 +62,7 @@
 # KILL is only used to suppress output.
 #
 # The layers of `configure'.  We let m4 undivert them by itself, when
-# it reaches the end of `configure.in'.
+# it reaches the end of `configure.ac'.
 #
 # - BINSH
 #   AC_REQUIRE'd #! /bin/sh line
@@ -268,7 +268,7 @@ m4_define([AU_DEFINE],
 # Also define NAME as a macro which code is NEW-CODE.
 #
 # This allows to share the same code for both supporting obsoleted macros,
-# and to update a configure.in.
+# and to update a configure.ac.
 # See `acobsolete.m4' for a longer description.
 m4_define([AU_DEFUN],
 [AU_DEFINE([$1],
@@ -580,7 +580,7 @@ m4_define([AC_HELP_STRING],
 
 
 # It is suggested that the macros in this section appear before
-# AC_INIT in `configure.in'.  Nevertheless, this is just stylistic,
+# AC_INIT in `configure.ac'.  Nevertheless, this is just stylistic,
 # and from the implementation point of, AC_INIT *must* be expanded
 # beforehand: it puts data in diversions which must appear before the
 # data provided by the macros of this section.
@@ -732,7 +732,7 @@ m4_define([_AC_INIT_DEFAULTS_FDS],
 
 # _AC_INIT_DEFAULTS
 # -----------------
-# Values which defaults can be set from `configure.in'.
+# Values which defaults can be set from `configure.ac'.
 # `/bin/machine' is used in `glibcbug'.  The others are used in config.*
 m4_define([_AC_INIT_DEFAULTS],
 [m4_divert_push([DEFAULTS])dnl
@@ -1408,7 +1408,8 @@ m4_define([_AC_INIT_HELP],
     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
+    elif test -f $ac_sub_srcdir/configure.ac ||
+           test -f $ac_sub_srcdir/configure.in; then
       echo
       $ac_configure --help
     else
@@ -3537,7 +3538,7 @@ m4_define([AC_LIST_COMMANDS_COMMANDS])
 # `default-2' etc. for each call.
 #
 # Unfortunately this scheme is fragile: bad things might happen
-# if you update an included file and configure.in: you might have
+# if you update an included file and configure.ac: you might have
 # clashes :(  On the other hand, I'd like to avoid weird keys (e.g.,
 # depending upon __file__ or the pid).
 AU_DEFUN([AC_OUTPUT_COMMANDS],
@@ -4250,7 +4251,7 @@ m4_define([_AC_OUTPUT_FILES],
 cat >>$CONFIG_STATUS <<EOF
 dnl Neutralize VPATH when `$srcdir' = `.'.
   sed "$ac_vpsub
-dnl Shell code in configure.in might set extrasub.
+dnl Shell code in configure.ac might set extrasub.
 dnl FIXME: do we really want to maintain this feature?
 $extrasub
 EOF
@@ -4698,7 +4699,8 @@ m4_define([_AC_OUTPUT_SUBDIRS],
       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
+    elif test -f $ac_sub_srcdir/configure.ac ||
+           test -f $ac_sub_srcdir/configure.in; then
       ac_sub_configure=$ac_configure
     else
       AC_MSG_WARN([no configuration information is in $ac_subdir])
Index: autoconf.sh
--- autoconf.sh Sat, 23 Dec 2000 11:36:46 +0100 akim (ace/17_autoconf.s 
1.31.8.37 644)
+++ autoconf.sh Sat, 23 Dec 2000 11:41:07 +0100 akim (ace/17_autoconf.s 
1.31.8.37 644)
@@ -502,11 +502,11 @@
   # Transform the traces from m4 into an m4 input file.
   # Typically, transform:
   #
-  # | m4trace:configure.in:3: -1- AC_SUBST([exec_prefix], [NONE])
+  # | m4trace:configure.ac:3: -1- AC_SUBST([exec_prefix], [NONE])
   #
   # into
   #
-  # | AT_AC_SUBST([configure.in], [3], [1], [AC_SUBST], [exec_prefix], [NONE])
+  # | AT_AC_SUBST([configure.ac], [3], [1], [AC_SUBST], [exec_prefix], [NONE])
   #
   # Pay attention that the file name might include colons, if under DOS
   # for instance, so we don't use `[^:][^:]*'.
Index: autoheader.sh
--- autoheader.sh Sat, 23 Dec 2000 11:36:46 +0100 akim (ace/14_autoheader 
1.27.8.23 644)
+++ autoheader.sh Sat, 23 Dec 2000 11:41:27 +0100 akim (ace/14_autoheader 
1.27.8.23 644)
@@ -1,5 +1,5 @@
 #! @SHELL@
-# autoheader -- create `config.h.in' from `configure.in'
+# autoheader -- create `config.h.in' from `configure.ac'
 # Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000
 # Free Software Foundation, Inc.
 
@@ -308,7 +308,7 @@
 test -r $localdir/acconfig.h &&
   sed '/@BOTTOM@/,$d;s/@TOP@//' $localdir/acconfig.h >>$tmp/config.hin
 
-# Dump the templates from `configure.in'.
+# Dump the templates from `configure.ac'.
 for verb in `(set) 2>&1 | sed -n -e '/^ac_verbatim/s/^\([^=]*\)=.*$/\1/p' | 
sort`; do
   echo >>$tmp/config.hin
   eval echo '"${'$verb'}"' >>$tmp/config.hin
Index: autoreconf.sh
--- autoreconf.sh Sat, 23 Dec 2000 11:36:46 +0100 akim (ace/12_autoreconf 1.48 
644)
+++ autoreconf.sh Sat, 23 Dec 2000 11:43:45 +0100 akim (ace/12_autoreconf 1.48 
644)
@@ -298,9 +298,9 @@
 
 # Make a list of directories to process.
 # The xargs grep filters out Cygnus configure.in files.
-find . -name configure.in -print |
-xargs grep -l AC_OUTPUT |
-sed 's%/configure\.in$%%; s%^./%%' |
+find . -name configure.ac -o -name configure.ac -print |
+xargs grep -l AC_INIT |
+sed 's,/configure\.ac$,,;s,/configure\.in$,,;s,^./,,' |
 while read dir; do
   (
   cd $dir || continue
Index: autoscan.pl
--- autoscan.pl Tue, 12 Dec 2000 20:23:51 +0100 akim (ace/13_autoscan.p 1.18 
644)
+++ autoscan.pl Sat, 23 Dec 2000 11:44:06 +0100 akim (ace/13_autoscan.p 1.18 
644)
@@ -1,5 +1,5 @@
 #! @PERL@ -w
-# autoscan - Create configure.scan (a preliminary configure.in) for a package.
+# autoscan - Create configure.scan (a preliminary configure.ac) for a package.
 # Copyright 1994, 1999, 2000 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -47,7 +47,7 @@
 Examine source files in the directory tree rooted at SRCDIR, or the
 current directory if none is given.  Search the source files for
 common portability problems and create a file `configure.scan' which
-is a preliminary `configure.in' for that package.
+is a preliminary `configure.ac' for that package.
 
   -h, --help            print this help, then exit
   -V, --version         print version number, then exit
@@ -117,7 +117,7 @@
   # The data file format supports only one line of macros per function.
   # If more than that is required for a common portability problem,
   # a new Autoconf macro should probably be written for that case,
-  # instead of duplicating the code in lots of configure.in files.
+  # instead of duplicating the code in lots of configure.ac files.
 
   foreach $kind ('functions', 'headers', 'identifiers', 'programs',
                 'makevars') {
@@ -317,7 +317,7 @@
   }
 }
 
-# Print a configure.in.
+# Print a configure.ac.
 sub output
 {
   local (%unique_makefiles);
Index: autoupdate.sh
--- autoupdate.sh Sat, 23 Dec 2000 11:36:46 +0100 akim (ace/11_autoupdate 1.33 
644)
+++ autoupdate.sh Sat, 23 Dec 2000 11:44:29 +0100 akim (ace/11_autoupdate 1.33 
644)
@@ -25,7 +25,7 @@
 usage="\
 Usage: $0 [OPTION] ...  [TEMPLATE-FILE...]
 
-Update the TEMPLATE-FILE... if given, or \`configure.in' if present,
+Update the TEMPLATE-FILE... if given, or \`configure.ac' if present,
 or else \`configure.in', to the syntax of the current version of
 Autoconf.  The original files are backed up.
 
@@ -498,7 +498,7 @@ AC_DEFUN.
 features, m4sugar.m4 is needed.  Please note that the fact that
 Autoconf's macros are not loaded is positive on two points:
 
-- we do get an updated `configure.in', not a `configure'!
+- we do get an updated `configure.ac', not a `configure'!
 
 - the old macros are replaced by *calls* to the new-macros, not the
   body of the new macros, since their body is not defined!!!
Index: doc/install.texi
--- doc/install.texi Sat, 02 Dec 2000 12:27:01 +0100 akim (ace/15_install.te 
1.16 644)
+++ doc/install.texi Sat, 23 Dec 2000 11:45:19 +0100 akim (ace/15_install.te 
1.16 644)
@@ -28,10 +28,10 @@ @node Basic Installation
 at some point @file{config.cache} contains results you don't want to
 keep, you may remove or edit it.
 
-The file @file{configure.in} is used to create @file{configure} by a
-program called @code{autoconf}.  You only need @file{configure.in} if
-you want to change it or regenerate @file{configure} using a newer
-version of @code{autoconf}.
+The file @file{configure.ac} (or @file{configure.in}) is used to create
address@hidden by a program called @code{autoconf}.  You only need
address@hidden if you want to change it or regenerate
address@hidden using a newer version of @code{autoconf}.
 
 @noindent
 The simplest way to compile this package is:
Index: m4sugar.m4
--- m4sugar.m4 Fri, 15 Dec 2000 19:32:22 +0100 akim (ace/b/27_libm4.m4 1.48 644)
+++ m4sugar.m4 Sat, 23 Dec 2000 11:46:12 +0100 akim (ace/b/27_libm4.m4 1.48 644)
@@ -874,7 +874,7 @@ m4_define([m4_divert_text],
 # The Axel Thimm implementation at work
 # -------------------------------------
 #
-# We consider the macros above, and this configure.in:
+# We consider the macros above, and this configure.ac:
 #
 #          AC_INIT
 #          TEST1