diff options
| author | Zack Weinberg <zackw@panix.com> | 2020-12-14 14:50:47 -0500 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2020-12-14 17:53:03 -0800 |
| commit | ccb57553e3433df3e52e534e6f87915db23ff9a5 (patch) | |
| tree | 8d8a09e67e6527d241407ef6fc614e1ed46e6149 /m4 | |
| parent | 6a753ef54ae4688f60a1a22415e028e4b51ca372 (diff) | |
| download | automake-ccb57553e3433df3e52e534e6f87915db23ff9a5.tar.gz | |
Fix some build and test failures with Autoconf 2.70.
Autoconf 2.70 (released last week) makes a few changes that broke Automake’s
expectations, mostly in the test suite. This patch addresses two of the
problems:
- autoconf now issues a warning if fed a configure script that doesn’t invoke
both AC_INIT and AC_OUTPUT; this, plus a problem with system-provided
tools (still under investigation) broke the *build* on macOS; it also
causes a couple of spurious testsuite failures.
- AC_PACKAGE_NAME and AC_PACKAGE_VERSION are now defined unconditionally.
AM_INIT_AUTOMAKE needs to use m4_ifset instead of m4_ifdef to diagnose
the obsolete use of AC_INIT with fewer than two arguments. (This change
is compatible with autoconf 2.69; m4_ifset is much older, and it means
‘defined with a non-empty value’.)
* configure.ac: Use both AC_INIT and AC_OUTPUT in test configure scripts.
* t/deprecated-acinit.sh, t/init.sh: Likewise.
* m4/init.m4 (AM_INIT_AUTOMAKE): Use m4_ifset, not m4_ifdef, to detect
AC_PACKAGE_NAME and/or AC_PACKAGE_VERSION not having a value.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/init.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/m4/init.m4 b/m4/init.m4 index f82d756c2..cbe8fddf8 100644 --- a/m4/init.m4 +++ b/m4/init.m4 @@ -64,7 +64,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. m4_if( - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl |