From: Eric Blake <ebb9@byu.net>
Date: Fri, 12 Oct 2007 18:14:03 +0000 (-0600)
Subject: s/AC_VERSION/AC_AUTOCONF_VERSION/.
X-Git-Tag: v2.62~213^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=408ce204ae8dc7e8e7df54d3faa52d95234fb51d;p=thirdparty%2Fautoconf.git

s/AC_VERSION/AC_AUTOCONF_VERSION/.

* doc/autoconf.texi (Versioning): Change the name.
* NEWS: Likewise.
* lib/autoconf/general.m4 (AC_AUTOCONF_VERSION): Likewise.
* tests/tools.at (autoconf: AC_AUTOCONF_VERSION): Likewise.
Suggested by Ralf Wildenhues.

Signed-off-by: Eric Blake <ebb9@byu.net>
---

diff --git a/ChangeLog b/ChangeLog
index c1d5c0dca..80567a532 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-10-12  Eric Blake  <ebb9@byu.net>
 
+	s/AC_VERSION/AC_AUTOCONF_VERSION/.
+	* doc/autoconf.texi (Versioning): Change the name.
+	* NEWS: Likewise.
+	* lib/autoconf/general.m4 (AC_AUTOCONF_VERSION): Likewise.
+	* tests/tools.at (autoconf: AC_AUTOCONF_VERSION): Likewise.
+	Suggested by Ralf Wildenhues.
+
 	Namespace cleanup.
 	* lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE)
 	(_AC_OUTPUT_HEADERS_PREPARE): Convert here-doc delimiters into
diff --git a/NEWS b/NEWS
index 5c0e3c55b..f24c58565 100644
--- a/NEWS
+++ b/NEWS
@@ -19,7 +19,8 @@ GNU Autoconf NEWS - User visible changes.
    generated by autoconf under the license of your own program.
  FIXME - revisit this line once exception clause is finalized.
 
-** New Autoconf macros AC_OPENMP, AC_PATH_PROGS_FEATURE_CHECK, AC_VERSION.
+** New Autoconf macros:
+   AC_AUTOCONF_VERSION  AC_OPENMP  AC_PATH_PROGS_FEATURE_CHECK
 
 ** AC_C_BIGENDIAN now supports universal binaries a la Mac OS X.
 
@@ -75,7 +76,7 @@ GNU Autoconf NEWS - User visible changes.
 ** Document the m4sugar macros m4_ifndef and m4_version_compare
    (available without documentation since at least autoconf 2.53).
    Packages using the undocumented m4sugar macro m4_PACKAGE_VERSION
-   should consider using the new AC_VERSION instead.
+   should consider using the new AC_AUTOCONF_VERSION instead.
 
 ** Warnings are now generated by default when an installer invokes
    'configure' with an unknown --enable-* or --with-* option.
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 74295b655..f8550a4eb 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -1792,8 +1792,8 @@ This macro is the only macro that may be used before @code{AC_INIT}, but
 for consistency, you are invited not to do so.
 @end defmac
 
-@defmac AC_VERSION
-@acindex{VERSION}
+@defmac AC_AUTOCONF_VERSION
+@acindex{AUTOCONF_VERSION}
 This macro was introduced in Autoconf 2.62.  It identifies the version
 of Autoconf that is currently parsing the input file, in a format
 suitable for @code{m4_version_compare} (@pxref{m4_version_compare}); in
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 1b7a35534..b57d8872c 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -299,10 +299,10 @@ AU_DEFUN([AC_PREREQ],
 m4_copy([m4_version_prereq], [AC_PREREQ])
 
 
-# AC_VERSION
-# ----------
+# AC_AUTOCONF_VERSION
+# -------------------
 # The current version of Autoconf parsing this file.
-m4_copy([m4_PACKAGE_VERSION], [AC_VERSION])
+m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])
 
 
 
diff --git a/tests/tools.at b/tests/tools.at
index e13a737c1..aca280893 100644
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -405,13 +405,13 @@ AT_CHECK([echo 'AC_INIT(X, 2.0, bug-autoconf@gnu.org)' | autoconf -t AC_INIT -],
 AT_CLEANUP
 
 
-# autoconf: AC_VERSION
+# autoconf: AC_AUTOCONF_VERSION
 # --------------------------------------
-AT_SETUP([autoconf: AC_VERSION])
+AT_SETUP([autoconf: AC_AUTOCONF_VERSION])
 
 AT_DATA([configure.ac],
 [[AC_INIT
-version AC_VERSION version
+version AC_AUTOCONF_VERSION version
 AC_OUTPUT
 ]])