From: Alexandre Duret-Lutz Date: Wed, 24 Sep 2003 21:20:06 +0000 (+0000) Subject: * configure.in: Rename as ... X-Git-Tag: v1.10.2~770 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=18d5b4821f87f7948a3495d2388b04aa60cc1216;p=platform%2Fupstream%2Fautomake.git * configure.in: Rename as ... * configure.ac: ... this. * README: s/configure.in/configure.ac/. --- diff --git a/ChangeLog b/ChangeLog index 030d650..4c4bf27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2003-09-24 Alexandre Duret-Lutz + * 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 dbf6b2f..52bb726 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 ad96930..b3d6655 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 dae32ab..c6fc5bc 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 2ac8034..132cbc1 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 similarity index 100% rename from configure.in rename to configure.ac diff --git a/doc/Makefile.in b/doc/Makefile.in index b049032..fb8ee63 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 77a1656..71dd62a 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 93855fb..e964954 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 c7dfed9..6076751 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 2abc672..bef8b32 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 4e91c9e..2ab0959 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 66b3bb2..b69b1aa 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)/$@