X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=bootstrap;h=c2507fc78fcdb9121a24523a6dd6338302460850;hp=c2d560480c58b9c8b3af286677feb6e867dea344;hb=fb998000e60b32219c2bf839044cff59f499dff1;hpb=f482e7ea665938152518fe15cd71cfe882dd2b30

diff --git a/bootstrap b/bootstrap
index c2d5604..c2507fc 100755
--- a/bootstrap
+++ b/bootstrap
@@ -38,45 +38,52 @@ autopoint --force
 # (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
-sed '
-  /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
-  /^MSGID_BUGS_ADDRESS *=/s/=.*/= '"$MSGID_BUGS_ADDRESS"'/
-  /^XGETTEXT_OPTIONS *=/{
-    s/$/ \\/
-    a\
-        '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
-  }
-' po/Makevars.template >po/Makevars
-
 gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 <$gnulib_tool || exit
 
 (cd daemon && mkdir -p tests lib && ../$gnulib_tool --update)
 
 modules='
+arpa_inet
+c-ctype
 closeout
+error
+filevercmp
+fts
+full-read
+full-write
 gitlog-to-changelog
 gnu-make
 gnumakefile
+hash
+hash-pjw
 ignore-value
+lock
 maintainer-makefile
 manywarnings
+netinet_in
 progname
+setenv
 strchrnul
 strerror
 strndup
 vasprintf
 vc-list-files
 warnings
+xalloc
+xalloc-die
+xstrtol
+xstrtoll
+xvasprintf
 '
 
 $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