summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorZack Weinberg <zackw@panix.com>2020-12-14 14:50:47 -0500
committerKarl Berry <karl@freefriends.org>2020-12-14 17:53:03 -0800
commitccb57553e3433df3e52e534e6f87915db23ff9a5 (patch)
tree8d8a09e67e6527d241407ef6fc614e1ed46e6149 /t
parent6a753ef54ae4688f60a1a22415e028e4b51ca372 (diff)
downloadautomake-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 't')
-rw-r--r--t/deprecated-acinit.sh1
-rw-r--r--t/init.sh1
2 files changed, 2 insertions, 0 deletions
diff --git a/t/deprecated-acinit.sh b/t/deprecated-acinit.sh
index 21614bafa..f393d6534 100644
--- a/t/deprecated-acinit.sh
+++ b/t/deprecated-acinit.sh
@@ -35,6 +35,7 @@ for ac_init in AC_INIT 'AC_INIT([Makefile.am])'; do
$ac_init
$am_init_automake
AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
END
cat configure.ac # For debugging.
$ACLOCAL 2>stderr && { cat stderr >&2; exit 1; }
diff --git a/t/init.sh b/t/init.sh
index c6f6d6461..df138a040 100644
--- a/t/init.sh
+++ b/t/init.sh
@@ -25,6 +25,7 @@ for ac_init_args in '' '([x])'; do
unindent >configure.ac <<END
AC_INIT$ac_init_args
AM_INIT_AUTOMAKE$am_init_args
+ AC_OUTPUT
END
cat configure.ac # For debugging.
# The error message should mention AC_INIT, not AC_PACKAGE_VERSION.