From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 28 Dec 2012 22:59:00 +0000 (+0100)
Subject: maint: reflect removal of 'configure.in' support in comments and messages
X-Git-Tag: v1.16~151
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00d2aff2e1a75045b36ca01194d8e29a44c0814b;p=thirdparty%2Fautomake.git

maint: reflect removal of 'configure.in' support in comments and messages

* t/help.sh, syntax-checks.mk, aclocal.in, old/TODO: In these files.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/aclocal.in b/aclocal.in
index 39351ad23..d38ac22a8 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -81,7 +81,7 @@ my @diff_command;
 # --dry-run
 my $dry_run = 0;
 
-# configure.ac or configure.in.
+# configure.ac
 my $configure_ac;
 
 # Output file name.
@@ -995,7 +995,7 @@ sub usage ($)
   print <<'EOF';
 Usage: aclocal [OPTION]...
 
-Generate 'aclocal.m4' by scanning 'configure.ac' or 'configure.in'
+Generate 'aclocal.m4' by scanning 'configure.ac'
 
 Options:
       --automake-acdir=DIR  directory holding automake-provided m4 files
diff --git a/old/TODO b/old/TODO
index f8e4754df..fcd8a58f6 100644
--- a/old/TODO
+++ b/old/TODO
@@ -233,7 +233,7 @@ characters long.
 *    Make sure that all the files in the distribution are world-readable.
 
 should be able to determine what is built by looking at rules (and
-configure.in).  Then built man pages (eg) could automatically be
+configure.ac).  Then built man pages (eg) could automatically be
 omitted from the distribution.
 
 Right now, targets generated internally (eg "install") are not
@@ -445,7 +445,7 @@ consider auto-including any file that matches "*.in".
 must look at mkid to see how it works (for subdir usage)
   [ right now, it doesn't.  i don't see a simple fix right now ]
 
-if configure.in not found, move up a directory and try again?  This
+if configure.ac not found, move up a directory and try again?  This
 could eliminate a common source of problems.
   [ this is just a bad idea ]
 
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 180176710..9d5626e91 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -438,9 +438,10 @@ sc_m4_am_plain_egrep_fgrep:
 	  exit 1; \
 	fi
 
-## Prefer 'configure.ac' over the obsolescent 'configure.in' as the name
+## Use 'configure.ac', not the obsolete 'configure.in', as the name
 ## for configure input files in our testsuite.  The latter  has been
-## deprecated for several years (at least since autoconf 2.50).
+## deprecated for several years (at least since autoconf 2.50) and
+## support for it will be removed in Automake 1.14.
 sc_tests_no_configure_in:
 	@if grep -E '\bconfigure\\*\.in\b' $(xtests) $(xdefs) \
 	      | grep -Ev '/backcompat.*\.(sh|tap):' \
diff --git a/t/help.sh b/t/help.sh
index 961fcea9b..f27d8b101 100755
--- a/t/help.sh
+++ b/t/help.sh
@@ -14,8 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make sure --help and --version work, even when no configure.ac nor
-# configure.in is in the current directory.
+# Make sure --help and --version work, even when no configure.ac is in
+# the current directory.
 
 . test-init.sh
 
@@ -33,8 +33,7 @@ $ACLOCAL --help
 $AUTOMAKE --version
 $AUTOMAKE --help
 
-# Sanity checks: aclocal and automake cannot work without configure.ac
-# nor configure.in.
+# Sanity checks: aclocal and automake cannot work without configure.ac.
 $ACLOCAL 2>stderr && { cat stderr >&2; exit 1; }
 cat stderr >&2
 $FGREP configure.ac stderr