diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2007-10-29 20:45:48 +0100 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2007-10-29 20:45:48 +0100 |
| commit | fafa1e12e9964b9be11b5b90110492e4027dd490 (patch) | |
| tree | 17412d5e1fcd9b009ca16d2e1ef3eff949c95d94 /m4/amversion.in | |
| parent | 409466a98d6d20912629a9707000f73131b58b78 (diff) | |
| download | automake-fafa1e12e9964b9be11b5b90110492e4027dd490.tar.gz | |
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.
Diffstat (limited to 'm4/amversion.in')
| -rw-r--r-- | m4/amversion.in | 6 |
1 files changed, 4 insertions, 2 deletions
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)]) |