diff options
author | Bernhard Voelker <mail@bernhard-voelker.de> | 2021-03-22 23:45:30 +0100 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2021-03-22 16:52:11 -0700 |
commit | b5a6a56ffcefdd03f2f153214a9d25514a4b501a (patch) | |
tree | 12ed37384d5e9d05c542bb323c01c5e353afaf5d | |
parent | a71539e62830927957ddea3ddb7615f68ffcc55b (diff) | |
download | coreutils-b5a6a56ffcefdd03f2f153214a9d25514a4b501a.tar.gz |
maint: update bootstrap from gnulib
* bootstrap: Sync from gnulib/build-aux/bootstrap; the previous gnulib
update (commit 1a3eb6c30) missed to update that file.
-rwxr-xr-x | bootstrap | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2020-11-18.17; # UTC +scriptversion=2021-01-10.00; # UTC # Bootstrap this package from checked-out sources. @@ -47,7 +47,7 @@ PERL="${PERL-perl}" me=$0 -default_gnulib_url=git://git.sv.gnu.org/gnulib +default_gnulib_url=https://git.savannah.gnu.org/git/gnulib.git usage() { cat <<EOF @@ -184,7 +184,7 @@ po_download_command_format=\ https://translationproject.org/latest/%s/" # Prefer a non-empty tarname (4th argument of AC_INIT if given), else -# fall back to the package name (1st argument with munging) +# fall back to the package name (1st argument with munging). extract_package_name=' /^AC_INIT(\[*/{ s/// @@ -201,8 +201,11 @@ extract_package_name=' p } ' -package=$(sed -n "$extract_package_name" configure.ac) \ - || die 'cannot find package name in configure.ac' +package=$(${AUTOCONF:-autoconf} --trace AC_INIT:\$4 configure.ac 2>/dev/null) +if test -z "$package"; then + package=$(sed -n "$extract_package_name" configure.ac) \ + || die 'cannot find package name in configure.ac' +fi gnulib_name=lib$package build_aux=build-aux |