TAP driver: no need to invoke AC_PROG_AWK directly

It is already required by AM_INIT_AUTOMAKE anyway.

* doc/automake.texi: Adjust examples.
* t/tap-doc2.sh: Adjust documentation-tracking test.
* m4/init.m4 (AM_INIT_AUTOMAKE): Explicitly tell that the AC_PROG_AWK
requirement is also needed whenever the TAP driver is used.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/doc/automake.texi b/doc/automake.texi
index cd33ad7c305122e6728cd4566a021ac31cebed02..645e7298f535f61d0201db17da32b4a5c8debc94 100644 (file)
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -9650,10 +9650,9 @@ Currently, the TAP driver that comes with Automake requires some by-hand
 steps on the developer's part (this situation should hopefully be improved
 in future Automake versions).  You'll have to grab the @file{tap-driver.sh}
 script from the Automake distribution by hand, copy it in your source tree,
-add a call to @code{AC_PROG_AWK} in @file{configure.ac} to search for a
-proper awk program, and use the Automake support for third-party test
-drivers to instruct the harness to use the @file{tap-driver.sh} script
-and that awk program to run your TAP-producing tests.  See the example
+and use the Automake support for third-party test drivers to instruct the
+harness to use the @file{tap-driver.sh} script and the awk program found
+by @code{AM_INIT_AUTOMAKE} to run your TAP-producing tests.  See the example
 below for clarification.
 
 Apart from the options common to all the Automake test drivers
@@ -9709,7 +9708,6 @@ AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([foreign -Wall -Werror])
 AC_CONFIG_FILES([Makefile])
 AC_REQUIRE_AUX_FILE([tap-driver.sh])
-AC_PROG_AWK
 AC_OUTPUT
 
 % @kbd{cat Makefile.am}

diff --git a/m4/init.m4 b/m4/init.m4
index 432ff200c9861590c5f0d8506cc63572ab248773..05ad294fcce119dd8def4735890b7e535ca35138 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -90,8 +90,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl

diff --git a/t/tap-doc2.sh b/t/tap-doc2.sh
index ddac739c3318f09e5ae855d2e8c504965edfcf15..d260d9a08ca7b0b7a431bec796c8f25a5d39029f 100644 (file)
--- a/t/tap-doc2.sh
+++ b/t/tap-doc2.sh
@@ -34,7 +34,6 @@ AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([foreign -Wall -Werror])
 AC_CONFIG_FILES([Makefile])
 AC_REQUIRE_AUX_FILE([tap-driver.sh])
-AC_PROG_AWK
 AC_OUTPUT
 END