X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=bootstrap;h=7010ecae4eb13fd5006dd4d09ae959c426ea3d0d;hp=3fd8811e86de04de8a2924ac364b2e1a81ff7d03;hb=73c587ff0f2f8f76af39b16dafb0949be7bf0883;hpb=6cd965e007f65d6e62872c6ddd782f1de06046e3

diff --git a/bootstrap b/bootstrap
index 3fd8811..7010eca 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,21 +57,38 @@ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 (cd daemon && mkdir -p tests lib && ../$gnulib_tool --update)
 
 modules='
+arpa_inet
+c-ctype
+closeout
+full-write
 gitlog-to-changelog
 gnu-make
 gnumakefile
+hash
+hash-pjw
 ignore-value
+lock
 maintainer-makefile
 manywarnings
+netinet_in
 progname
-warnings
+strchrnul
+strerror
+strndup
+vasprintf
 vc-list-files
+warnings
+xstrtol
+xstrtoll
 '
 
 $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