X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=bootstrap;h=c3f7d6e99a21ffe3bb347a07ef15a340f0b8de51;hp=cea8c407d425b192e29a525f8a143f9990c83ade;hb=0fc0e4bd73c60c1cd742509a70cf79932def4ea5;hpb=9f7ebef3d464a2e40fae75012201a5da2740b99c

diff --git a/bootstrap b/bootstrap
index cea8c40..c3f7d6e 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,19 +57,30 @@ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 (cd daemon && mkdir -p tests lib && ../$gnulib_tool --update)
 
 modules='
+closeout
 gitlog-to-changelog
 gnu-make
 gnumakefile
+ignore-value
 maintainer-makefile
 manywarnings
-warnings
+progname
+strchrnul
+strerror
+strndup
+vasprintf
 vc-list-files
+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 --no-recursive