diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rwxr-xr-x | build-aux/bootstrap | 10 | ||||
| -rw-r--r-- | top/bootstrap-funclib.sh | 10 |
3 files changed, 11 insertions, 18 deletions
@@ -1,3 +1,12 @@ +2023-03-09 Jim Meyering <meyering@fb.com> + + bootstrap: remove code that accommodated RHEL5's old autoreconf + * top/bootstrap-funclib.sh (autogen) [AUTORECONFFLAGS]: RHEL5 has not + been supported since 2017. It included (and this code worked around) + a version of autoreconf that was so old it did not accept the + --no-recursive option. Drop that workaround. + * build-aux/bootstrap: Regenerate. + 2023-03-08 Bruno Haible <bruno@clisp.org> gettimeofday, timespec_get tests: Avoid test failure on glibc/Linux. diff --git a/build-aux/bootstrap b/build-aux/bootstrap index c6c4901d3f..e634872de1 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -37,7 +37,7 @@ medir=`dirname "$me"` # A library of shell functions for autopull.sh, autogen.sh, and bootstrap. -scriptlibversion=2023-01-06.19; # UTC +scriptlibversion=2023-03-09.14; # UTC # Copyright (C) 2003-2023 Free Software Foundation, Inc. # @@ -1237,14 +1237,6 @@ autogen() # 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. - case $($AUTORECONF --help) in - *--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 $AUTORECONFFLAGS" AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS \ diff --git a/top/bootstrap-funclib.sh b/top/bootstrap-funclib.sh index fca6a0392e..b6960dd4c6 100644 --- a/top/bootstrap-funclib.sh +++ b/top/bootstrap-funclib.sh @@ -1,6 +1,6 @@ # A library of shell functions for autopull.sh, autogen.sh, and bootstrap. -scriptlibversion=2023-01-06.19; # UTC +scriptlibversion=2023-03-09.14; # UTC # Copyright (C) 2003-2023 Free Software Foundation, Inc. # @@ -1200,14 +1200,6 @@ autogen() # 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. - case $($AUTORECONF --help) in - *--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 $AUTORECONFFLAGS" AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS \ |