Let Automake support `configure.ac'.

* automake.in: In the comments, prefer `configure.ac' to
`configure.in'.
When using &am_conf_error, don't repeat `in configure.in', since
the function already reports it.
When referring to `configure.in' use `$configure_ac' instead.
(configure_ac): New global variable.
(scan_configure, scan_one_configure_file): Rename as...
(scan_autoconf_files, scan_one_autoconf_file): this.
(scan_autoconf_files): Compute $configure_ac.
(transform): New function.
(handle_configure): Use it to transform CONFIGURE_AC in
`remake.am' and in `remake-hdr.am'.
(common_files): Also consider `configure.ac'.
Use consistently single quotes.
* aclocal.in (configure_ac): New variable.
Use it.
* texi-vers.am: Depend on CONFIGURE_AC not configure.in.
* remake.am: Likewise.
* remake-hdr.am: Likewise.

1 files changed, 24 insertions, 21 deletions

diff --git a/automake.texi b/automake.texi
index 383cc78f1..bb8a14f2a 100644
--- a/automake.texi
+++ b/automake.texi
@@ -112,7 +112,7 @@ This edition documents version @value{VERSION}.
 * Generalities::                General ideas
 * Examples::                    Some example packages
 * Invoking Automake::           Creating a Makefile.in
-* configure::                   Scanning configure.in
+* configure::                   Scanning configure.ac or configure.in
 * Top level::                   The top-level Makefile.am
 * Programs::                    Building programs and libraries
 * Other objects::               Other derived objects
@@ -131,8 +131,8 @@ This edition documents version @value{VERSION}.
 * Extending::                   Extending Automake
 * Distributing::                Distributing the Makefile.in
 * Future::                      Some ideas for the future
-* Macro and Variable Index::    
-* General Index::               
+* Macro and Variable Index::
+* General Index::
 @end menu
 
 @end ifinfo
@@ -166,7 +166,10 @@ should generally be one @file{Makefile.am} per directory of a project.
 Automake does constrain a project in certain ways; for instance it
 assumes that the project uses Autoconf (@pxref{Top, , Introduction,
 autoconf, The Autoconf Manual}), and enforces certain restrictions on
-the @file{configure.in} contents.
+the @file{configure.in} contents@footnote{Autoconf 2.50 promotes
+@file{configure.ac} over @file{configure.in}.  The rest of this
+documentation will refer to @file{configure.in} as this use is not yet
+spread, but Automake supports @file{configure.ac} too.}.
 
 @cindex Automake requirements
 @cindex Requirements, Automake
@@ -680,7 +683,7 @@ Last we have @file{src/Makefile.am}, where all the real work is done:
 
 @example
 bin_PROGRAMS = hello
-hello_SOURCES = hello.c version.c getopt.c getopt1.c getopt.h system.h 
+hello_SOURCES = hello.c version.c getopt.c getopt1.c getopt.h system.h
 hello_LDADD = @@INTLLIBS@@ @@ALLOCA@@
 localedir = $(datadir)/locale
 INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\"
@@ -1467,10 +1470,10 @@ to build programs and libraries.
 * A Shared Library::            Building a Libtool library
 * Program variables::           Variables used when building a program
 * Yacc and Lex::                Yacc and Lex support
-* C++ Support::                 
-* Fortran 77 Support::          
+* C++ Support::
+* Fortran 77 Support::
 * Java Support::
-* Support for Other Languages::  
+* Support for Other Languages::
 * ANSI::                        Automatic de-ANSI-fication
 * Dependencies::                Automatic dependency tracking
 @end menu
@@ -1503,7 +1506,7 @@ to generate a program named @code{hello}.  The variable
 into an executable:
 
 @example
-hello_SOURCES = hello.c version.c getopt.c getopt1.c getopt.h system.h 
+hello_SOURCES = hello.c version.c getopt.c getopt1.c getopt.h system.h
 @end example
 
 This causes each mentioned @samp{.c} file to be compiled into the
@@ -1866,13 +1869,13 @@ We recommend using the following renaming hack used in @code{gdb}:
 #define	yylval	c_lval
 #define	yychar	c_char
 #define	yydebug	c_debug
-#define	yypact	c_pact	
-#define	yyr1	c_r1			
-#define	yyr2	c_r2			
-#define	yydef	c_def		
-#define	yychk	c_chk		
-#define	yypgo	c_pgo		
-#define	yyact	c_act		
+#define	yypact	c_pact
+#define	yyr1	c_r1
+#define	yyr2	c_r2
+#define	yydef	c_def
+#define	yychk	c_chk
+#define	yypgo	c_pgo
+#define	yyact	c_act
 #define	yyexca	c_exca
 #define yyerrflag c_errflag
 #define yynerrs	c_nerrs
@@ -1989,10 +1992,10 @@ Fortran 77 With C and C++}).
 These issues are covered in the following sections.
 
 @menu
-* Preprocessing Fortran 77::    
-* Compiling Fortran 77 Files::  
-* Mixing Fortran 77 With C and C++::  
-* Fortran 77 and Autoconf::     
+* Preprocessing Fortran 77::
+* Compiling Fortran 77 Files::
+* Mixing Fortran 77 With C and C++::
+* Fortran 77 and Autoconf::
 @end menu
 
 
@@ -2118,7 +2121,7 @@ Automake would have issued a warning.
 
 @page
 @menu
-* How the Linker is Chosen::    
+* How the Linker is Chosen::
 @end menu
 
 @node How the Linker is Chosen,  , Mixing Fortran 77 With C and C++, Mixing Fortran 77 With C and C++