diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2018-02-25 22:26:28 +0100 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@gnu.org> | 2018-02-25 22:26:28 +0100 |
| commit | ca238468c7d82435eabfbafea3956ad99eb8ad23 (patch) | |
| tree | f530fc501658a6cc29d10fa3d5d9c1c08b193766 /m4/amversion.m4 | |
| parent | 006c4dfede96091f5bed622c17946cbec067347f (diff) | |
| parent | 4f73bb80d1583441ed4a1c681a843fe4d9d5e26c (diff) | |
| download | automake-ca238468c7d82435eabfbafea3956ad99eb8ad23.tar.gz | |
Merge branch 'release'
Diffstat (limited to 'm4/amversion.m4')
| -rw-r--r-- | m4/amversion.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/m4/amversion.m4 b/m4/amversion.m4 index c0130257d..9e06a9ecf 100644 --- a/m4/amversion.m4 +++ b/m4/amversion.m4 @@ -12,10 +12,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.15a' +[am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15a], [], +m4_if([$1], [1.16], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -31,7 +31,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15a])dnl +[AM_AUTOMAKE_VERSION([1.16])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |