From: Akim Demaille Date: Fri, 28 Dec 2012 10:49:19 +0000 (+0100) Subject: gnulib: update X-Git-Tag: v2.7.90~200 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/a565e60eefd0cfe3fd982410f5573272a7004dc4 gnulib: update --- diff --git a/bootstrap b/bootstrap index e3e270b0..c84d2496 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /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. @@ -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. diff --git a/gnulib b/gnulib index f022473f..bd22b19a 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit f022473fdaf724d84817c4003120b9a38fbf884b +Subproject commit bd22b19aee6af003640e65281c9939b268766ee4 diff --git a/m4/.gitignore b/m4/.gitignore index 2f440bf7..5b7d3630 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -180,4 +180,3 @@ /obstack-printf.m4 /extern-inline.m4 /non-recursive-gnulib-prefix-hack.m4 -/inline.m4