diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2007-10-29 20:45:48 +0100 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2007-11-11 17:45:18 +0100 |
| commit | 70847420d762a5eddec81f79c0f7a8c15928637a (patch) | |
| tree | 1ccbe34968ea0979d75b87144c17357cfdec626e | |
| parent | c13365444659b638ea7b77e8b9e4b90b63d706d7 (diff) | |
| download | automake-70847420d762a5eddec81f79c0f7a8c15928637a.tar.gz automake-70847420d762a5eddec81f79c0f7a8c15928637a.tar.bz2 automake-70847420d762a5eddec81f79c0f7a8c15928637a.zip | |
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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | aclocal.in | 4 | ||||
| -rw-r--r-- | aclocal.m4 | 4 | ||||
| -rw-r--r-- | m4/amversion.in | 6 | ||||
| -rw-r--r-- | m4/amversion.m4 | 6 | ||||
| -rwxr-xr-x | tests/missing4.test | 2 |
6 files changed, 23 insertions, 7 deletions
@@ -1,3 +1,11 @@ +2007-11-11 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-11-11 Bruno Haible <bruno@clisp.org> * doc/automake.texi (Program variables): Clarify that diff --git a/aclocal.in b/aclocal.in index 4efb7afb3..eac545feb 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 e8c05c32a..976a76763 100644 --- 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 c820cf0a7..ab5759061 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([@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 57d11ec2c..151d4cbfb 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.10.0a])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 5fab894db..13697cbcf 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 |