maint: add autobuild prerequisite only if autobuild.m4 is absent.

* bootstrap (func_require_autobuild_buildreq): Skip if autobuild.m4
is already present.
* bootstrap.conf (require_autobuild_bulidreq): No need to set this
specially any more.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>

diff --git a/bootstrap b/bootstrap
index 120ba94ad4e3e65f2ca9c1eec3ca2c1441f05333..ecfa39b722855ca1bdc90c05317155a694916a9b 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1248,7 +1248,11 @@ func_require_autobuild_buildreq ()
 {
     $debug_cmd
 
-    printf '%s\n' "$buildreq" |func_grep_q '^[  ]*autobuild' || {
+    $require_macro_dir
+
+    test -f "$macro_dir/autobuild.m4" \
+        || printf '%s\n' "$buildreq" |func_grep_q '^[   ]*autobuild' \
+        || {
       $require_configure_ac
 
       func_extract_trace AB_INIT

diff --git a/bootstrap.conf b/bootstrap.conf
index db4ab88d059906de23707b9708d0fd09a2764be8..116023c191ccf01442c63704c5a0a833d5cce0ad 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -438,9 +438,6 @@ func_add_hook func_fini libtool_cleanup_empty_dirs
 ## Resource management. ##
 ## -------------------- ##
 
-# Although autobuild is awesome, libtool will bootstrap without it.
-require_autobuild_buildreq=:
-
 # require_package_url
 # -------------------
 # Ensure that package_url has a sensible default.