X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=bootstrap;h=0dd31a9c283d8adea42759b85c98e6591ac735cf;hp=6007e5977cdb6176a8643d7e7b90688ac12d0dad;hb=343ba6d482643882c3ab3a529f3d882ee1ba36f9;hpb=cada248a53858341c91f70392e8f5b6e47d9b4fe

diff --git a/bootstrap b/bootstrap
index 6007e59..0dd31a9 100755
--- a/bootstrap
+++ b/bootstrap
@@ -38,19 +38,6 @@ 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
 
@@ -60,23 +47,35 @@ modules='
 arpa_inet
 c-ctype
 closeout
+error
+filevercmp
+fts
+full-read
+full-write
 gitlog-to-changelog
 gnu-make
 gnumakefile
 hash
 hash-pjw
+human
 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			\
@@ -85,6 +84,7 @@ $gnulib_tool			\
   --m4-base=m4			\
   --source-base=gnulib/lib	\
   --tests-base=gnulib/tests	\
+  --libtool			\
   --import $modules
 
 # Disable autopoint and libtoolize, since they were already done above.