Accommodate for new macro AC_AUTOCONF_VERSION.

* aclocal.in (write_aclocal): Use AC_AUTOCONF_VERSION rather
than m4_PACKAGE_VERSION.  Define the former if not defined.
* m4/amversion.in (AM_SET_CURRENT_AUTOMAKE_VERSION): Likewise.
* tests/missing4.test: Use AC_AUTOCONF_VERSION.

diff --git a/ChangeLog b/ChangeLog
index de69a259dea0de92c424b06c7695b326f7b3b88e..eb5fdac83b264e9d53a4180d63fc0bf4412eb59f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-29  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Accommodate for new macro AC_AUTOCONF_VERSION.
+       * aclocal.in (write_aclocal): Use AC_AUTOCONF_VERSION rather
+       than m4_PACKAGE_VERSION.  Define the former if not defined.
+       * m4/amversion.in (AM_SET_CURRENT_AUTOMAKE_VERSION): Likewise.
+       * tests/missing4.test: Use AC_AUTOCONF_VERSION.
+
 2007-10-29  Bruno Haible  <bruno@clisp.org>
 
        * doc/automake.texi (Program variables): Clarify that

diff --git a/aclocal.in b/aclocal.in
index 4efb7afb3b6de32a41a3e78c3674d4ad0173b70a..eac545feb70edc56141415ae518818fb678891b2 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -782,7 +782,9 @@ sub write_aclocal ($@)
       # Do not use "$output_file" here for the same reason we do not
       # use it in the header below.  autom4te will output the name of
       # the file in the diagnostic anyway.
-      $output = "m4_if(m4_PACKAGE_VERSION, [$ac_version],,
+      $output = "m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [$ac_version],,
 [m4_warning([this file was generated for autoconf $ac_version.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.

diff --git a/aclocal.m4 b/aclocal.m4
index 7ae7e5bf113f35693f96d9747e017d157036b5e1..9a1cf888a420c22f2945a4bca457699b6ef61620 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -11,7 +11,9 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_if(m4_PACKAGE_VERSION, [2.61],,
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
 [m4_warning([this file was generated for autoconf 2.61.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.

diff --git a/m4/amversion.in b/m4/amversion.in
index c820cf0a7990840228b5b47a5492e59d8d9fc244..ab5759061cf7a23707e6f27ff44416d7563933b9 100644 (file)
--- a/m4/amversion.in
+++ b/m4/amversion.in
@@ -1,6 +1,6 @@
 ##                                                          -*- Autoconf -*-
 ## @configure_input@
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -32,4 +32,6 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
 [AM_AUTOMAKE_VERSION([@VERSION@])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])

diff --git a/m4/amversion.m4 b/m4/amversion.m4
index d7b5f9f06aeecdc813839b4c1a94c85cf96c660a..b114980086e570257819e7530f6ab7025af9b834 100644 (file)
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -1,6 +1,6 @@
 ##                                                          -*- Autoconf -*-
 ## Generated from amversion.in; do not edit by hand.
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -32,4 +32,6 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
 [AM_AUTOMAKE_VERSION([1.10a])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])

diff --git a/tests/missing4.test b/tests/missing4.test
index 5fab894db5bb56d963d259663af7b88f1578d0a2..13697cbcf21964516c900f3cd89ad24dc1c71551 100755 (executable)
--- a/tests/missing4.test
+++ b/tests/missing4.test
@@ -35,7 +35,7 @@ $AUTOMAKE
 ./configure
 $MAKE
 
-sed '1,20 s/m4_PACKAGE_VERSION,/&9999/' < aclocal.m4 > aclocal.tmp
+sed '1,20 s/AC_AUTOCONF_VERSION,/&9999/' < aclocal.m4 > aclocal.tmp
 cmp aclocal.m4 aclocal.tmp && exit 1
 
 mv aclocal.tmp aclocal.m4