X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=bootstrap;h=5ceac31825e6c3af4e8c7e42529a35aaad106180;hp=c2d560480c58b9c8b3af286677feb6e867dea344;hb=bf0280bf589573c11529999a73e9ec642dea9d61;hpb=f482e7ea665938152518fe15cd71cfe882dd2b30 diff --git a/bootstrap b/bootstrap index c2d5604..5ceac31 100755 --- a/bootstrap +++ b/bootstrap @@ -38,45 +38,56 @@ 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 + +# 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