summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--HACKING4
-rw-r--r--Makefile.in10
-rw-r--r--README8
-rwxr-xr-xbootstrap4
-rw-r--r--configure.ac (renamed from configure.in)0
-rw-r--r--doc/Makefile.in8
-rw-r--r--lib/Automake/Makefile.in8
-rw-r--r--lib/Automake/tests/Makefile.in8
-rw-r--r--lib/Makefile.in8
-rw-r--r--lib/am/Makefile.in8
-rw-r--r--m4/Makefile.in8
-rw-r--r--tests/Makefile.in8
13 files changed, 45 insertions, 41 deletions
diff --git a/ChangeLog b/ChangeLog
index 030d65068..4c4bf2741 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2003-09-24 Alexandre Duret-Lutz <adl@gnu.org>
+ * configure.in: Rename as ...
+ * configure.ac: ... this.
+ * README: s/configure.in/configure.ac/.
+
* doc/fdl.texi: New file.
* doc/Makefile.am (automake_TEXINFOS): New variable.
* doc/automake.texi (Copying This Manual): New appendix, include
diff --git a/HACKING b/HACKING
index dbf6b2f78..52bb726a6 100644
--- a/HACKING
+++ b/HACKING
@@ -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 info-gnu@gnu.org,
autotools-announce@gnu.org, and automake@gnu.org.
-* 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.
-----
diff --git a/Makefile.in b/Makefile.in
index ad969302a..b3d665579 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -37,7 +37,7 @@ POST_UNINSTALL = :
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \
- Makefile.am NEWS THANKS TODO aclocal.m4 configure configure.in
+ Makefile.am NEWS THANKS TODO aclocal.m4 configure configure.ac
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__configure_deps = $(top_srcdir)/m4/amversion.m4 \
$(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/init.m4 \
@@ -168,9 +168,9 @@ all: all-recursive
.SUFFIXES:
am--refresh:
@:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
@for dep in $?; do \
- case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \
+ case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
*$$dep*) \
echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
cd $(srcdir) && $(AUTOMAKE) --gnu \
@@ -194,9 +194,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+$(top_srcdir)/configure: $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): $(top_srcdir)/configure.in $(am__configure_deps)
+$(ACLOCAL_M4): $(top_srcdir)/configure.ac $(am__configure_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
diff --git a/README b/README
index dae32ab5c..c6fc5bcfb 100644
--- a/README
+++ b/README
@@ -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 @@ files. Read the documentation to see what to do.
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 @@ Mail suggestions and bug reports to bug-automake@gnu.org.
-----
-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.
diff --git a/bootstrap b/bootstrap
index 2ac80347c..132cbc13f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -53,7 +53,7 @@ if test -z "$PERL"; then
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 @@ else
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
diff --git a/configure.in b/configure.ac
index 8381180e0..8381180e0 100644
--- a/configure.in
+++ b/configure.ac
diff --git a/doc/Makefile.in b/doc/Makefile.in
index b04903288..fb8ee63ba 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -139,9 +139,9 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .dvi .html .info .pdf .ps .texi
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
@for dep in $?; do \
- case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \
+ case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
*$$dep*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
&& exit 0; \
@@ -163,9 +163,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+$(top_srcdir)/configure: $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(top_srcdir)/configure.in $(am__configure_deps)
+$(ACLOCAL_M4): $(top_srcdir)/configure.ac $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
.texi.info:
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 77a1656fc..71dd62a8d 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -164,9 +164,9 @@ EXTRA_DIST = Config.in
all: all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
@for dep in $?; do \
- case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \
+ case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
*$$dep*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
&& exit 0; \
@@ -188,9 +188,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+$(top_srcdir)/configure: $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(top_srcdir)/configure.in $(am__configure_deps)
+$(ACLOCAL_M4): $(top_srcdir)/configure.ac $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
uninstall-info-am:
install-dist_perllibDATA: $(dist_perllib_DATA)
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 93855fb18..e96495429 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -121,9 +121,9 @@ EXTRA_DIST = $(TESTS)
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
@for dep in $?; do \
- case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \
+ case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
*$$dep*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
&& exit 0; \
@@ -145,9 +145,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+$(top_srcdir)/configure: $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(top_srcdir)/configure.in $(am__configure_deps)
+$(ACLOCAL_M4): $(top_srcdir)/configure.ac $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
uninstall-info-am:
tags: TAGS
diff --git a/lib/Makefile.in b/lib/Makefile.in
index c7dfed91e..607675106 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -140,9 +140,9 @@ dist_script_DATA = config.guess config.sub install-sh mdate-sh missing \
all: all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
@for dep in $?; do \
- case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \
+ case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
*$$dep*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
&& exit 0; \
@@ -164,9 +164,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+$(top_srcdir)/configure: $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(top_srcdir)/configure.in $(am__configure_deps)
+$(ACLOCAL_M4): $(top_srcdir)/configure.ac $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
uninstall-info-am:
install-dist_pkgvdataDATA: $(dist_pkgvdata_DATA)
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 2abc6723d..bef8b32d8 100644
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -126,9 +126,9 @@ texinfos.am yacc.am
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
@for dep in $?; do \
- case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \
+ case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
*$$dep*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
&& exit 0; \
@@ -150,9 +150,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+$(top_srcdir)/configure: $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(top_srcdir)/configure.in $(am__configure_deps)
+$(ACLOCAL_M4): $(top_srcdir)/configure.ac $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
uninstall-info-am:
install-dist_amDATA: $(dist_am_DATA)
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 4e91c9e64..2ab09591a 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -151,9 +151,9 @@ EXTRA_DIST = dirlist amversion.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
@for dep in $?; do \
- case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \
+ case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
*$$dep*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
&& exit 0; \
@@ -175,9 +175,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+$(top_srcdir)/configure: $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(top_srcdir)/configure.in $(am__configure_deps)
+$(ACLOCAL_M4): $(top_srcdir)/configure.ac $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
uninstall-info-am:
install-dist_m4dataDATA: $(dist_m4data_DATA)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 66b3bb272..b69b1aa1f 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -617,9 +617,9 @@ check_SCRIPTS = defs aclocal-$(APIVERSION) automake-$(APIVERSION)
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)
@for dep in $?; do \
- case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \
+ case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \
*$$dep*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
&& exit 0; \
@@ -641,9 +641,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
+$(top_srcdir)/configure: $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(top_srcdir)/configure.in $(am__configure_deps)
+$(ACLOCAL_M4): $(top_srcdir)/configure.ac $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
defs: $(top_builddir)/config.status defs.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@