FYI: mv configure.in configure.ac

[Alexandre Duret-Lutz]

I'm checking this in.

2003-09-24  Alexandre Duret-Lutz  <address@hidden>

        * configure.in: Rename as ...
        * configure.ac: ... this.
        * README: s/configure.in/configure.ac/.

Index: HACKING
===================================================================
RCS file: /cvs/automake/automake/HACKING,v
retrieving revision 1.18
diff -u -r1.18 HACKING
--- HACKING     13 Sep 2003 21:54:26 -0000      1.18
+++ HACKING     24 Sep 2003 21:18:05 -0000
@@ -119,7 +119,7 @@
 
 * Update NEWS.  For an alpha release, update README-alpha.
 
-* Update the version number in configure.in.
+* Update the version number in configure.ac.
   (The idea is that every other alpha number will be a net release.
   The repository will always have its own "odd" number so we can easily
   distinguish net and repo versions.)
@@ -139,7 +139,7 @@
   Then send the announcement at least to address@hidden,
   address@hidden, and address@hidden
 
-* Update version number in configure.in to next alpha number.
+* Update version number in configure.ac to next alpha number.
   Re-run autoconf and commit.
 
 -----
Index: README
===================================================================
RCS file: /cvs/automake/automake/README,v
retrieving revision 1.17
diff -u -r1.17 README
--- README      22 Sep 2001 16:05:36 -0000      1.17
+++ README      24 Sep 2003 21:18:05 -0000
@@ -1,11 +1,11 @@
 This is Automake, a Makefile generator.  It was inspired by the 4.4BSD
 make and include files, but aims to be portable and to conform to the
-GNU standards for Makefile variables and targets.
+GNU Coding Standards for Makefile variables and targets.
 
 Automake is a Perl script.  The input files are called Makefile.am.
 The output files are called Makefile.in; they are intended for use
 with Autoconf.  Automake requires certain things to be done in your
-configure.in.
+configure.ac.
 
 Variable assignment lines in Makefile.am pull in defaults from various
 little *.am files.
@@ -15,7 +15,7 @@
 
 This package also includes the "aclocal" program.  aclocal is a
 program to generate an `aclocal.m4' based on the contents of
-`configure.in'.  It is useful as an extensible, maintainable mechanism
+`configure.ac'.  It is useful as an extensible, maintainable mechanism
 for augmenting autoconf.  It is intended that other package authors
 will write m4 macros which can be automatically used by aclocal.
 
@@ -32,7 +32,7 @@
 
 -----
 
-Copyright 1994, 1995, 1996, 1997, 1998, 2001 Free Software Foundation,
+Copyright 1994, 1995, 1996, 1997, 1998, 2001, 2003 Free Software Foundation,
 Inc.
 
 This file is part of GNU Automake.
Index: bootstrap
===================================================================
RCS file: /cvs/automake/automake/bootstrap,v
retrieving revision 1.12
diff -u -r1.12 bootstrap
--- bootstrap   6 Aug 2003 21:20:15 -0000       1.12
+++ bootstrap   24 Sep 2003 21:18:05 -0000
@@ -53,7 +53,7 @@
 fi
 
 # Variables to substitute
-VERSION=`sed -ne '/AC_INIT/s/^[^[]*\[[^[]*\[\([^]]*\)\].*$/\1/p' configure.in`
+VERSION=`sed -ne '/AC_INIT/s/^[^[]*\[[^[]*\[\([^]]*\)\].*$/\1/p' configure.ac`
 PACKAGE=automake
 datadir=.
 
@@ -67,7 +67,7 @@
 fi
 
 # Read the rule for calculating APIVERSION and execute it
-apiver_cmd=`sed -ne 's/\[\[/[/g;s/\]\]/]/g;/^APIVERSION=/p' configure.in`
+apiver_cmd=`sed -ne 's/\[\[/[/g;s/\]\]/]/g;/^APIVERSION=/p' configure.ac`
 eval $apiver_cmd
 
 # Sanity checks
Index: configure.ac
===================================================================
RCS file: configure.ac
diff -N configure.ac
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ configure.ac        24 Sep 2003 21:18:07 -0000
@@ -0,0 +1,126 @@
+# Process this file with autoconf to produce a configure script.
+
+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+AC_PREREQ(2.57b)
+AC_INIT([GNU Automake], [1.7a], address@hidden)
+
+AC_CONFIG_SRCDIR(automake.in)
+AC_CONFIG_AUX_DIR(lib)
+
+AC_CANONICAL_BUILD
+
+# Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it;
+# this way we can run Autoconf tests from configure without being
+# bothered by `missing'.
+am_AUTOCONF=${AUTOCONF-autoconf}
+
+AM_INIT_AUTOMAKE([1.6 dist-bzip2])
+
+# The API version is the base version.  We must guarantee
+# compatibility for all releases with the same API version.
+# Our current rule is that:
+# * All releases, including the prereleases, in an X.Y series
+#   are compatible.  So 1.5.1c is compatible with 1.5.
+# * Prereleases on the trunk are all incompatible -- 1.5b and 1.5c
+#   aren't the same.
+APIVERSION=`echo "$VERSION" | sed -e 
's/^\([[0-9]]*\.[[0-9]]*[[a-z]]*\).*$/\1/'`
+AC_SUBST(APIVERSION)
+
+# A versioned directory, defined here for convenience.
+pkgvdatadir="\${datadir}/automake-${APIVERSION}"
+AC_SUBST(pkgvdatadir)
+
+# $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
+# hence `.' is really what we want for perllibdir, libdir, and acdir.
+ACLOCAL="perllibdir=`pwd`/lib:./lib `pwd`/aclocal --acdir=m4"
+AUTOMAKE="perllibdir=`pwd`/lib:./lib `pwd`/automake --libdir=lib"
+
+AC_PATH_PROG(PERL, perl)
+if test -z "$PERL"; then
+   AC_MSG_ERROR([perl not found])
+fi
+$PERL -e 'require 5.005;' || {
+   AC_MSG_ERROR([perl 5.005 or better is required])
+}
+
+# The test suite will skip some tests if tex is absent.
+AC_CHECK_PROG([TEX], [tex], [tex])
+
+# Test for Autoconf.  We run Autoconf in a subdirectory to ease
+# deletion of any files created (such as those added to
+# autom4te.cache).
+mkdir conftest
+echo 'AC''_PREREQ(2.54)' > conftest/conftest.ac
+AM_RUN_LOG([cd conftest && eval $am_AUTOCONF -o /dev/null conftest.ac]) || {
+   AC_MSG_ERROR([Autoconf 2.54 or better is required.
+  Is it installed?  Is it in your PATH?  (try running `autoconf --version')
+  Is it working?  See also config.log for error messages before this one.])
+}
+rm -rf conftest
+
+# Test for ln.  We need use it to install the versioned binaries.
+AC_MSG_CHECKING([whether ln works])
+AC_CACHE_VAL([am_cv_prog_ln], [
+rm -f conftest conftest.file
+: >conftest.file
+if ln conftest.file conftest 2>/dev/null; then
+  am_cv_prog_ln=ln
+else
+  am_cv_prog_ln='cp -p'
+fi
+rm -f conftest conftest.file])
+AC_SUBST([LN], [$am_cv_prog_ln])
+result=no
+test "x$am_cv_prog_ln" = xln && result=yes
+AC_MSG_RESULT([$result])
+
+# The amount we should wait after modifying files depends on the platform.
+# On Windows '95, '98 and ME, files modifications have 2-seconds
+# granularity and can be up to 3 seconds in the future w.r.t. the
+# system clock.  When it is important to ensure one file is older
+# than another we wait at least 5 seconds between creations.
+case $build in
+  *-pc-msdosdjgpp) MODIFICATION_DELAY=5;;
+  *)               MODIFICATION_DELAY=2;;
+esac
+AC_SUBST([MODIFICATION_DELAY])
+
+# Test for things needed by the test suite.
+AC_PROG_EGREP
+AC_PROG_FGREP
+
+AC_CONFIG_FILES([
+  Makefile
+  doc/Makefile
+  lib/Automake/Makefile
+  lib/Automake/tests/Makefile
+  lib/Makefile
+  lib/am/Makefile
+  m4/Makefile
+  tests/Makefile
+  tests/defs
+])
+AC_CONFIG_FILES([tests/aclocal-${APIVERSION}:tests/aclocal.in],
+                [chmod +x tests/aclocal-${APIVERSION}],
+               [APIVERSION=$APIVERSION])
+AC_CONFIG_FILES([tests/automake-${APIVERSION}:tests/automake.in],
+                [chmod +x tests/automake-${APIVERSION}])
+
+AC_OUTPUT
Index: configure.in
===================================================================
RCS file: configure.in
diff -N configure.in
--- configure.in        23 Sep 2003 22:39:11 -0000      1.131
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,126 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-
-# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-AC_PREREQ(2.57b)
-AC_INIT([GNU Automake], [1.7a], address@hidden)
-
-AC_CONFIG_SRCDIR(automake.in)
-AC_CONFIG_AUX_DIR(lib)
-
-AC_CANONICAL_BUILD
-
-# Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it;
-# this way we can run Autoconf tests from configure without being
-# bothered by `missing'.
-am_AUTOCONF=${AUTOCONF-autoconf}
-
-AM_INIT_AUTOMAKE([1.6 dist-bzip2])
-
-# The API version is the base version.  We must guarantee
-# compatibility for all releases with the same API version.
-# Our current rule is that:
-# * All releases, including the prereleases, in an X.Y series
-#   are compatible.  So 1.5.1c is compatible with 1.5.
-# * Prereleases on the trunk are all incompatible -- 1.5b and 1.5c
-#   aren't the same.
-APIVERSION=`echo "$VERSION" | sed -e 
's/^\([[0-9]]*\.[[0-9]]*[[a-z]]*\).*$/\1/'`
-AC_SUBST(APIVERSION)
-
-# A versioned directory, defined here for convenience.
-pkgvdatadir="\${datadir}/automake-${APIVERSION}"
-AC_SUBST(pkgvdatadir)
-
-# $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
-# hence `.' is really what we want for perllibdir, libdir, and acdir.
-ACLOCAL="perllibdir=`pwd`/lib:./lib `pwd`/aclocal --acdir=m4"
-AUTOMAKE="perllibdir=`pwd`/lib:./lib `pwd`/automake --libdir=lib"
-
-AC_PATH_PROG(PERL, perl)
-if test -z "$PERL"; then
-   AC_MSG_ERROR([perl not found])
-fi
-$PERL -e 'require 5.005;' || {
-   AC_MSG_ERROR([perl 5.005 or better is required])
-}
-
-# The test suite will skip some tests if tex is absent.
-AC_CHECK_PROG([TEX], [tex], [tex])
-
-# Test for Autoconf.  We run Autoconf in a subdirectory to ease
-# deletion of any files created (such as those added to
-# autom4te.cache).
-mkdir conftest
-echo 'AC''_PREREQ(2.54)' > conftest/conftest.ac
-AM_RUN_LOG([cd conftest && eval $am_AUTOCONF -o /dev/null conftest.ac]) || {
-   AC_MSG_ERROR([Autoconf 2.54 or better is required.
-  Is it installed?  Is it in your PATH?  (try running `autoconf --version')
-  Is it working?  See also config.log for error messages before this one.])
-}
-rm -rf conftest
-
-# Test for ln.  We need use it to install the versioned binaries.
-AC_MSG_CHECKING([whether ln works])
-AC_CACHE_VAL([am_cv_prog_ln], [
-rm -f conftest conftest.file
-: >conftest.file
-if ln conftest.file conftest 2>/dev/null; then
-  am_cv_prog_ln=ln
-else
-  am_cv_prog_ln='cp -p'
-fi
-rm -f conftest conftest.file])
-AC_SUBST([LN], [$am_cv_prog_ln])
-result=no
-test "x$am_cv_prog_ln" = xln && result=yes
-AC_MSG_RESULT([$result])
-
-# The amount we should wait after modifying files depends on the platform.
-# On Windows '95, '98 and ME, files modifications have 2-seconds
-# granularity and can be up to 3 seconds in the future w.r.t. the
-# system clock.  When it is important to ensure one file is older
-# than another we wait at least 5 seconds between creations.
-case $build in
-  *-pc-msdosdjgpp) MODIFICATION_DELAY=5;;
-  *)               MODIFICATION_DELAY=2;;
-esac
-AC_SUBST([MODIFICATION_DELAY])
-
-# Test for things needed by the test suite.
-AC_PROG_EGREP
-AC_PROG_FGREP
-
-AC_CONFIG_FILES([
-  Makefile
-  doc/Makefile
-  lib/Automake/Makefile
-  lib/Automake/tests/Makefile
-  lib/Makefile
-  lib/am/Makefile
-  m4/Makefile
-  tests/Makefile
-  tests/defs
-])
-AC_CONFIG_FILES([tests/aclocal-${APIVERSION}:tests/aclocal.in],
-                [chmod +x tests/aclocal-${APIVERSION}],
-               [APIVERSION=$APIVERSION])
-AC_CONFIG_FILES([tests/automake-${APIVERSION}:tests/automake.in],
-                [chmod +x tests/automake-${APIVERSION}])
-
-AC_OUTPUT
-- 
Alexandre Duret-Lutz