From: Zack Weinberg <zackw@panix.com>
Date: Wed, 7 Oct 2020 13:19:06 +0000 (-0400)
Subject: Use complete configure.ac’s in testsuite.
X-Git-Tag: v1.16.3~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f83372ba3406587100b043f6d6f266eaaeada4f;p=thirdparty%2Fautomake.git

Use complete configure.ac’s in testsuite.

Autoconf 2.70 will issue warnings if it encounters a configure.ac that doesn’t
call both AC_INIT and AC_OUTPUT.

Automake already issues warnings if it encounters a configure.ac that uses an
AM_ macro but doesn’t call AM_INIT_AUTOMAKE or AC_CONFIG_FILES([Makefile]).

In two places, the testsuite was tripping these warnings, leading to spurious
failures with Autoconf 2.70 betas.

* t/aminit-moreargs-deprecation.sh: Add AC_OUTPUT to test configure.ac.
* t/mkdirp-deprecation.sh: Use a complete test configure.ac, not a stub
  containing only a use of AM_PROG_MKDIR_P.
---

diff --git a/t/aminit-moreargs-deprecation.sh b/t/aminit-moreargs-deprecation.sh
index c3d49d502..ec9efe098 100644
--- a/t/aminit-moreargs-deprecation.sh
+++ b/t/aminit-moreargs-deprecation.sh
@@ -25,6 +25,7 @@ cat > configure.ac <<'END'
 AC_INIT([Makefile.am])
 AM_INIT_AUTOMAKE([twoargs], [1.0])
 AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
 END
 
 $ACLOCAL
diff --git a/t/mkdirp-deprecation.sh b/t/mkdirp-deprecation.sh
index 337ae301f..a356bf1f1 100644
--- a/t/mkdirp-deprecation.sh
+++ b/t/mkdirp-deprecation.sh
@@ -19,12 +19,19 @@
 
 . test-init.sh
 
-echo AM_PROG_MKDIR_P >> configure.ac
+cat > configure.ac <<'END'
+AC_INIT([test], [1.0])
+AM_INIT_AUTOMAKE
+AM_PROG_MKDIR_P
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
 : > Makefile.am
 
 grep_err ()
 {
-  loc='^configure.ac:4:'
+  loc='^configure.ac:3:'
   grep "$loc.*AM_PROG_MKDIR_P.*deprecated" stderr
   grep "$loc.* use .*AC_PROG_MKDIR_P" stderr
   grep "$loc.* use '\$(MKDIR_P)' instead of '\$(mkdir_p)'.*Makefile" stderr