X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=bootstrap;h=7efd838405ed352079d242757a81fd492047c40b;hp=c92d1e1c3ee0f064c79f701e19327b416bf6476b;hb=d64fca7b848df36f2043a8af72aaa670e3c14c53;hpb=6a14f1c2502f58ff7bed8cb451f95a83f5ee920a

diff --git a/bootstrap b/bootstrap
index c92d1e1..7efd838 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
 
@@ -58,22 +45,57 @@ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 
 modules='
 arpa_inet
+byteswap
 c-ctype
 closeout
+connect
+error
+filevercmp
+fsusage
+fts
+full-read
+full-write
+futimens
+getaddrinfo
+getline
 gitlog-to-changelog
+glob
 gnu-make
 gnumakefile
+hash
+hash-pjw
+human
 ignore-value
+lock
 maintainer-makefile
 manywarnings
+mkdtemp
+netdb
 netinet_in
+openat
+perror
+pread
 progname
+read-file
+readlink
+select
+setenv
+sleep
+socket
 strchrnul
 strerror
 strndup
+symlinkat
+sys_select
+sys_wait
 vasprintf
 vc-list-files
 warnings
+xalloc
+xalloc-die
+xstrtol
+xstrtoll
+xvasprintf
 '
 
 $gnulib_tool			\
@@ -82,6 +104,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.