diff options
| author | Jim Meyering <meyering@fb.com> | 2023-03-09 09:58:35 -0800 |
|---|---|---|
| committer | Jim Meyering <meyering@meta.com> | 2023-03-09 10:01:01 -0800 |
| commit | 0e272413ec0a8a7a08940bc7328224e9972c718f (patch) | |
| tree | 49a9fd049392aa8e1dafdc6d84aeacbf8af19cec | |
| parent | 074cf4b3753f2f37927eebdad8ebb1dd74ba057f (diff) | |
| download | gnulib-0e272413ec0a8a7a08940bc7328224e9972c718f.tar.gz | |
bootstrap: correct last change
* top/bootstrap-funclib.sh (autogen) [AUTORECONFFLAGS]: Do always
apply the --no-recursive option.
* build-aux/bootstrap: Regenerate.
Spotted by Bruno Haible.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | build-aux/bootstrap | 3 | ||||
| -rw-r--r-- | top/bootstrap-funclib.sh | 3 |
3 files changed, 9 insertions, 2 deletions
@@ -1,5 +1,10 @@ 2023-03-09 Jim Meyering <meyering@fb.com> + bootstrap: correct last change + * top/bootstrap-funclib.sh (autogen) [AUTORECONFFLAGS]: Do always + apply the --no-recursive option. + * build-aux/bootstrap: Regenerate. + 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) diff --git a/build-aux/bootstrap b/build-aux/bootstrap index e634872de1..b1350ff003 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-03-09.14; # UTC +scriptlibversion=2023-03-09.17; # UTC # Copyright (C) 2003-2023 Free Software Foundation, Inc. # @@ -1236,6 +1236,7 @@ autogen() # Invoke autoreconf with --force --install to ensure upgrades of tools # such as ylwrap. AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS" + AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive" # Tell autoreconf not to invoke autopoint or libtoolize; they were run above. echo "running: AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS" diff --git a/top/bootstrap-funclib.sh b/top/bootstrap-funclib.sh index b6960dd4c6..640f0e2ecc 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-03-09.14; # UTC +scriptlibversion=2023-03-09.17; # UTC # Copyright (C) 2003-2023 Free Software Foundation, Inc. # @@ -1199,6 +1199,7 @@ autogen() # Invoke autoreconf with --force --install to ensure upgrades of tools # such as ylwrap. AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS" + AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive" # Tell autoreconf not to invoke autopoint or libtoolize; they were run above. echo "running: AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS" |