X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=bootstrap;h=c92d1e1c3ee0f064c79f701e19327b416bf6476b;hp=1eee72d620fc8988c54971c28be54543e762e487;hb=9d25e82491ddcf495e1d30694327e4bfd3a23445;hpb=d35528d2405038b5864c8bfa85bd30d0f1485261

diff --git a/bootstrap b/bootstrap
index 1eee72d..c92d1e1 100755
--- a/bootstrap
+++ b/bootstrap
@@ -28,6 +28,16 @@ GNULIB_SRCDIR=.gnulib
 
 ls po/*.po 2>/dev/null | sed 's|.*/||; s|\.po$||' > po/LINGUAS
 
+# Run autopoint, to get po/Makevars.template:
+# 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 ..."
 rm -f po/Makevars
@@ -47,19 +57,32 @@ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 (cd daemon && mkdir -p tests lib && ../$gnulib_tool --update)
 
 modules='
+arpa_inet
+c-ctype
+closeout
 gitlog-to-changelog
 gnu-make
 gnumakefile
+ignore-value
 maintainer-makefile
 manywarnings
-warnings
+netinet_in
+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