Alfred M. Szmidt wrote:
> Mats reported the following problem when bootstraping inetutils with
> the latest gnulib/ (2011-12-17):
>
> configure.ac:152: error: possibly undefined macro: gl_FUNC_READLINE
>
> configure.ac:176: error: possibly undefined macro: AC_DEFINE
>
> This is due that we set ACLOCAL_FLAGS in bootstrap.conf, the change
> that introduced this is:
>
> * build-aux/bootstrap (AUTOPOINT, AUTORECONF): Factor out definitions.
> Run autopoint and libtoolize *before* gnulib-tool.
> After it, run an abbreviated autoreconf, rather than a loop around
> all tools.
> (slirp, bt_mark_as_generated): Remove functions.
>
> Since ACLOCAL_FLAGS isn't passed to autoreconf, I suggest the
> following fix.
>
> 2011-12-21 Alfred M. Szmidt <a...@gnu.org>
>
> * build-aux/bootstrap (AUTOPOINT): Pass ACLOCAL_FLAGS when
> invoking autoreconf.
Thanks to both of you for the report and patch.
I've adjusted the commit log (and ChangeLog, since it is identical)
to have a one-line summary, to mention the date and commit SHA1
of my bug-introducing patch, and to attribute Mats. Also, I added a
space-before-backslash in the patch itself.
As usual, since I've changed things, I'll wait for review/ACK
from you, Alfred, before pushing.
>From 56fffd23320280790f46a3c181a13dcf15361c98 Mon Sep 17 00:00:00 2001
From: "Alfred M. Szmidt" <a...@gnu.org>
Date: Wed, 21 Dec 2011 10:47:03 +0100
Subject: [PATCH] bootstrap: fix it to honor $ACLOCAL_FLAGS once again
The 2011-12-17 change, commit 767ccd40, replaced a manual invocation
of aclocal that used explicit $ACLOCAL_FLAGS with an invocation of
autoreconf that did not.
* build-aux/bootstrap: Use $ACLOCAL_FLAGS when invoking autoreconf.
Reported by Mats Erik Andersson <g...@gisladisker.se>.
---
ChangeLog | 9 +++++++++
build-aux/bootstrap | 6 +++---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 980b94b..d52e398 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-12-21 Alfred M. Szmidt <a...@gnu.org>
+
+ bootstrap: fix it to honor $ACLOCAL_FLAGS once again
+ The 2011-12-17 change, commit 767ccd40, replaced a manual invocation
+ of aclocal that used explicit $ACLOCAL_FLAGS with an invocation of
+ autoreconf that did not.
+ * build-aux/bootstrap: Use $ACLOCAL_FLAGS when invoking autoreconf.
+ Reported by Mats Erik Andersson <g...@gisladisker.se>.
+
2011-12-17 Jim Meyering <meyer...@redhat.com>
bootstrap: remove some now-unneeded code
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index a95c654..505a05e 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2011-12-17.15; # UTC
+scriptversion=2011-12-21.09; # UTC
# Bootstrap this package from checked-out sources.
@@ -821,9 +821,9 @@ find "$m4_base" "$source_base" \
# Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
echo "running: AUTOPOINT=true LIBTOOLIZE=true " \
- "$AUTORECONF --verbose --install --no-recursive -I $m4_base"
+ "$AUTORECONF --verbose --install --no-recursive -I $m4_base $ACLOCAL_FLAGS"
AUTOPOINT=true LIBTOOLIZE=true \
- $AUTORECONF --verbose --install --no-recursive -I $m4_base \
+ $AUTORECONF --verbose --install --no-recursive -I $m4_base $ACLOCAL_FLAGS \
|| exit 1
# Get some extra files from gnulib, overriding existing files.
--
1.7.8.354.g4f48c
