FYI: Use AC_AUTOCONF_VERSION if defined

[Ralf Wildenhues]

Applied to master.

Cheers,
Ralf

    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/aclocal.in b/aclocal.in
index 4efb7af..525b655 100644
--- 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 7ae7e5b..d60bf75 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -11,8 +11,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61b],,
+[m4_warning([this file was generated for autoconf 2.61b.
 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.
 To do so, use the procedure documented by the package, typically 
`autoreconf'.])])
diff --git a/m4/amversion.in b/m4/amversion.in
index c820cf0..2b4c264 100644
--- 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(address@hidden@])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 d7b5f9f..8042a31 100644
--- 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 5fab894..6bffa3b 100755
--- 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