mirror of
https://github.com/libguestfs/libguestfs.git
synced 2026-03-22 07:03:38 +00:00
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.
This commit is contained in:
@@ -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=.
|
||||
|
||||
10
bootstrap
10
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
|
||||
|
||||
Reference in New Issue
Block a user