[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 1/2] maint: avoid bootstrap warning



I noticed that in a fresh checkout, autogen.sh included the following:

autoreconf: running: automake --add-missing --copy --force-missing
gnulib/tests/Makefile.am:28: TESTS was already defined in condition TRUE, which includes condition WITH_EXPENSIVE_TESTS ...
gnulib/tests/gnulib.mk:28: ... `TESTS' previously defined here
gnulib/tests/Makefile.am:19:   `gnulib/tests/gnulib.mk' included from here

but after the run, line 28 of gnulib.mk lists GNULIB_TESTS, not TESTS.
After more investigation, I found that it is because gnulib bootstrap
provides two hooks, one before automake, and the other after; we were
having to rerun automake because we picked the wrong hook name, and
the warning was from the first run where the problem got fixed before
our manual second run.

The problem was introduced in commit 70363ea.

* bootstrap.conf (bootstrap_epilogue): Rename...
(bootstrap_post_import_hook): ...so that it gets run before automake.

Signed-off-by: Eric Blake <eblake redhat com>
---
 bootstrap.conf | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index a1d1f07..68c4a89 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -241,13 +241,11 @@ gnulib_extra_files="
 "


-bootstrap_epilogue()
+bootstrap_post_import_hook()
 {
   # Change paths in gnulib/tests/gnulib.mk from "../../.." to "../..",
-  # and make tests conditional by changing "TESTS" to "GNULIB_TESTS",
-  # then ensure that gnulib/tests/Makefile.in is up-to-date.
+  # and make tests conditional by changing "TESTS" to "GNULIB_TESTS".
   m=gnulib/tests/gnulib.mk
   sed 's,\.\./\.\./\.\.,../..,g; s/^TESTS /GNULIB_TESTS /' $m > $m-t
   mv -f $m-t $m
-  ${AUTOMAKE-automake} gnulib/tests/Makefile
 }
-- 
1.8.3.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]