X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=bootstrap;h=60e71fd719ecbf25205d66d40859b3619ab84452;hp=2eba6a712c30e860c3cf3b037e392a9d6339dcce;hb=b4852788e0a60eb6b5de84400b6a5c055f8531da;hpb=881770900938595565036b9b191cfdf39ff0dc98

diff --git a/bootstrap b/bootstrap
index 2eba6a7..60e71fd 100755
--- a/bootstrap
+++ b/bootstrap
@@ -29,7 +29,14 @@ GNULIB_SRCDIR=.gnulib
 ls po/*.po 2>/dev/null | sed 's|.*/||; s|\.po$||' > po/LINGUAS
 
 # Run autopoint, to get po/Makevars.template:
-autopoint
+# Also, released autopoint has the tendency to install macros that have
+# been obsoleted in current gnulib, so run this before gnulib-tool.
+autopoint --force
+
+# Autoreconf runs aclocal before libtoolize, which causes spurious
+# warnings if the initial aclocal is confused by the libtoolized
+# (or worse out-of-date) macro directory.
+libtoolize --copy --install
 
 # Create gettext configuration.
 echo "$0: Creating po/Makevars from po/Makevars.template ..."
@@ -50,7 +57,6 @@ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 (cd daemon && mkdir -p tests lib && ../$gnulib_tool --update)
 
 modules='
-asprintf
 closeout
 gitlog-to-changelog
 gnu-make
@@ -70,7 +76,10 @@ warnings
 $gnulib_tool			\
   --avoid=dummy			\
   --with-tests			\
-  --m4-base=gnulib/m4		\
+  --m4-base=m4			\
   --source-base=gnulib/lib	\
   --tests-base=gnulib/tests	\
   --import $modules
+
+# Disable autopoint and libtoolize, since they were already done above.
+AUTOPOINT=true LIBTOOLIZE=true autoreconf --verbose --install