From: Bruno Haible Date: Sun, 26 Jan 2025 03:29:59 +0000 (+0100) Subject: bootstrap: Remove obsolete code. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=2efde69cd56b03cdb841aa359106d4d43aef161d;p=gnulib.git bootstrap: Remove obsolete code. Reported by Basil L. Contovounesios in . * top/bootstrap-funclib.sh (package): Don't look at gl_INIT_PACKAGE invocations. * build-aux/bootstrap: Regenerated. --- diff --git a/ChangeLog b/ChangeLog index e909e9abcf..6f6fa30b13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2025-01-26 Bruno Haible + + bootstrap: Remove obsolete code. + Reported by Basil L. Contovounesios in + . + * top/bootstrap-funclib.sh (package): Don't look at gl_INIT_PACKAGE + invocations. + * build-aux/bootstrap: Regenerated. + 2025-01-24 Collin Funk ptsname_r: Work around ptsname_r bug on Solaris 11 OmniOS. diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 8e15db3bf3..fbbf76f578 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=2025-01-23.20; # UTC +scriptlibversion=2025-01-26.03; # UTC # Copyright (C) 2003-2025 Free Software Foundation, Inc. # @@ -173,15 +173,10 @@ normalize_package_name=' y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ s/[^abcdefghijklmnopqrstuvwxyz0123456789_]/-/g ' -package=$(${AUTOCONF:-autoconf} --trace 'gl_INIT_PACKAGE:$1' configure.ac \ - 2>/dev/null) +package=$(${AUTOCONF:-autoconf} --trace 'AC_INIT:$4' configure.ac 2>/dev/null) if test -z "$package"; then - 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 + package=$(sed -n "$extract_package_name" configure.ac) \ + || die 'cannot find package name in configure.ac' fi package=$(echo "$package" | sed "$normalize_package_name") gnulib_name=lib$package diff --git a/top/bootstrap-funclib.sh b/top/bootstrap-funclib.sh index 1810a5c783..ba53114017 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=2025-01-23.20; # UTC +scriptlibversion=2025-01-26.03; # UTC # Copyright (C) 2003-2025 Free Software Foundation, Inc. # @@ -136,15 +136,10 @@ normalize_package_name=' y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ s/[^abcdefghijklmnopqrstuvwxyz0123456789_]/-/g ' -package=$(${AUTOCONF:-autoconf} --trace 'gl_INIT_PACKAGE:$1' configure.ac \ - 2>/dev/null) +package=$(${AUTOCONF:-autoconf} --trace 'AC_INIT:$4' configure.ac 2>/dev/null) if test -z "$package"; then - 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 + package=$(sed -n "$extract_package_name" configure.ac) \ + || die 'cannot find package name in configure.ac' fi package=$(echo "$package" | sed "$normalize_package_name") gnulib_name=lib$package