summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2013-01-02 08:38:33 -0700
committerEric Blake <eblake@redhat.com>2013-01-02 09:38:30 -0700
commit7a74eeaf0644b042d775eecaacfc79cc2e477dc2 (patch)
tree2c24dce6a7cc4f0ec55e843b61002bffc7fd5e3e /bootstrap
parent91b749a0ac5d386e510aa7ed88dc91d59fee9a1d (diff)
downloadlibvirt-7a74eeaf0644b042d775eecaacfc79cc2e477dc2.tar.gz
maint: update to latest gnulib
'make syntax-check' warned that gnulib's copyright is now out of date. * .gnulib: Update to latest, for copyright year bump. * gnulib/local/m4/ssize_t.m4.diff: Regenerate. * bootstrap: Synchronize from upstream.
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap17
1 files changed, 9 insertions, 8 deletions
diff --git a/bootstrap b/bootstrap
index e3e270b007..012907ae51 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,10 +1,10 @@
#! /bin/sh
# Print a version string.
-scriptversion=2012-07-19.14; # UTC
+scriptversion=2012-12-28.10; # UTC
# Bootstrap this package from checked-out sources.
-# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -889,20 +889,21 @@ find "$m4_base" "$source_base" \
-depth \( -name '*.m4' -o -name '*.[ch]' \) \
-type l -xtype l -delete > /dev/null 2>&1
+# Invoke autoreconf with --force --install to ensure upgrades of tools
+# such as ylwrap.
+AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS"
+
# Some systems (RHEL 5) are using ancient autotools, for which the
# --no-recursive option had not been invented. Detect that lack and
# omit the option when it's not supported. FIXME in 2017: remove this
# hack when RHEL 5 autotools are updated, or when they become irrelevant.
-no_recursive=
case $($AUTORECONF --help) in
- *--no-recursive*) no_recursive=--no-recursive;;
+ *--no-recursive*) AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive";;
esac
# Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
-echo "running: AUTOPOINT=true LIBTOOLIZE=true " \
- "$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS"
-AUTOPOINT=true LIBTOOLIZE=true \
- $AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS \
+echo "running: AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS"
+AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS \
|| die "autoreconf failed"
# Get some extra files from gnulib, overriding existing files.