X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=bootstrap;h=b2960c1b18cc75bd643a34906306513d662ea695;hb=2929a0053a56e1d3b0bed26f16a1e1ad83141891;hp=cfd09751b19e581d928d2708397443b81abd80b0;hpb=cb9cb9b7dcdf62310c7b543aaac0a82d7f4b9319;p=hivex.git

diff --git a/bootstrap b/bootstrap
index cfd0975..b2960c1 100755
--- a/bootstrap
+++ b/bootstrap
@@ -36,7 +36,7 @@ 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
+libtoolize --copy --install || glibtoolize --copy --install
 
 # Create gettext configuration.
 echo "$0: Creating po/Makevars from po/Makevars.template ..."
@@ -55,26 +55,29 @@ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 <$gnulib_tool || exit
 
 modules='
-arpa_inet
+byteswap
 c-ctype
-closeout
+fcntl
+full-read
+full-write
 gitlog-to-changelog
 gnu-make
 gnumakefile
 ignore-value
+inttypes
 maintainer-makefile
 manywarnings
-netinet_in
 progname
-strchrnul
-strerror
 strndup
 vasprintf
 vc-list-files
 warnings
+xstrtol
+xstrtoll
 '
 
 $gnulib_tool			\
+  --libtool                     \
   --avoid=dummy			\
   --with-tests			\
   --m4-base=m4			\