X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=bootstrap;h=b2960c1b18cc75bd643a34906306513d662ea695;hb=7ab64739391d60a52755250e76b0f4a03878a7e8;hp=e861acb40d592832b9cf5171b014df28c08e880e;hpb=8cc227ce3ead0c4043432e3462560d7b31c538e9;p=hivex.git

diff --git a/bootstrap b/bootstrap
index e861acb..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,13 +55,16 @@ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 <$gnulib_tool || exit
 
 modules='
+byteswap
 c-ctype
+fcntl
 full-read
 full-write
 gitlog-to-changelog
 gnu-make
 gnumakefile
 ignore-value
+inttypes
 maintainer-makefile
 manywarnings
 progname
@@ -74,6 +77,7 @@ xstrtoll
 '
 
 $gnulib_tool			\
+  --libtool                     \
   --avoid=dummy			\
   --with-tests			\
   --m4-base=m4			\