From: Jim Meyering Date: Tue, 25 Aug 2009 07:10:21 +0000 (+0200) Subject: build: invoke autopoint with --force X-Git-Tag: 1.0.69~30 X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=f482e7ea665938152518fe15cd71cfe882dd2b30;p=libguestfs.git build: invoke autopoint with --force * bootstrap: Invoke autopoint with --force, to avoid warning about existing build-aux/config.rpath. Invoke libtoolize before gnulib-tool, to avoid spurious warnings. * autogen.sh: Add comments. Remove build-aux/config.rpath before running autoreconf. --- diff --git a/autogen.sh b/autogen.sh index 5179623..649ca7b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -33,6 +33,10 @@ else fi mkdir -p daemon/m4 + +# Remove this file, so autoreconf doesn't complain about it being +# locally modified. +rm -f build-aux/config.rpath autoreconf -i CONFIGUREDIR=. diff --git a/bootstrap b/bootstrap index 2eba6a7..c2d5604 100755 --- a/bootstrap +++ b/bootstrap @@ -29,7 +29,14 @@ GNULIB_SRCDIR=.gnulib ls po/*.po 2>/dev/null | sed 's|.*/||; s|\.po$||' > po/LINGUAS # Run autopoint, to get po/Makevars.template: -autopoint +# Also, released autopoint has the tendency to install macros that have +# been obsoleted in current gnulib, so run this before gnulib-tool. +autopoint --force + +# Autoreconf runs aclocal before libtoolize, which causes spurious +# warnings if the initial aclocal is confused by the libtoolized +# (or worse out-of-date) macro directory. +libtoolize --copy --install # Create gettext configuration. echo "$0: Creating po/Makevars from po/Makevars.template ..." @@ -50,7 +57,6 @@ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool (cd daemon && mkdir -p tests lib && ../$gnulib_tool --update) modules=' -asprintf closeout gitlog-to-changelog gnu-make