daemon: Remove separate configure of daemon subdirectory.

[libguestfs.git] / bootstrap

diff --git a/bootstrap b/bootstrap
index c3f7d6e..7efd838 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -38,39 +38,64 @@ 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
+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                   \
@@ -79,8 +104,8 @@ $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.
-AUTOPOINT=true LIBTOOLIZE=true \
-    autoreconf --verbose --install --no-recursive
+AUTOPOINT=true LIBTOOLIZE=true autoreconf --verbose --install