X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=bootstrap;h=5ceac31825e6c3af4e8c7e42529a35aaad106180;hp=ce8eeb095b2844ce6f92d7bb256b35e99eaaa3c5;hb=a0f85ba643990da25b6afe6a2bbd2407cf312c73;hpb=cb9613b993792c1c4b14fa0d9b5001ff644ac2f4;ds=sidebyside

diff --git a/bootstrap b/bootstrap
index ce8eeb0..5ceac31 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
 
@@ -76,6 +63,7 @@ maintainer-makefile
 manywarnings
 netinet_in
 progname
+setenv
 strchrnul
 strerror
 strndup
@@ -97,5 +85,9 @@ $gnulib_tool			\
   --tests-base=gnulib/tests	\
   --import $modules
 
+# ocaml/.depend is updated automatically. However, as it's included by
+# ocaml/Makefile.am we need to bootstrap it here.
+touch ocaml/.depend
+
 # Disable autopoint and libtoolize, since they were already done above.
 AUTOPOINT=true LIBTOOLIZE=true autoreconf --verbose --install