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 /aclocal.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 'aclocal.in')
| -rw-r--r-- | aclocal.in | 4 |
1 files changed, 3 insertions, 1 deletions
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. |