Basil L. Contovounesios wrote:
> > And here's a further simplification: No more need to pass the PACKAGE name
> > twice in different places.
>
> Great, thank you! That means bootstrap can be reverted to not tracing
> gl_INIT_PACKAGE again, right?
Right. Thanks for noticing it. Done through the patch below.
> Another nice effect is that the 'redundant' ACLOCAL_AMFLAGS = -I m4 is
> no longer essential.
Good to hear that. Yes, a missing definition of gl_INIT_PACKAGE_VERSION
is not fatal: it merely means that autom4te will see a version 'dummy'.
> Now I've noticed a separate issue with the VERSION_NUMBER docs:
> running 'make dist' in a dirty worktree seems to get stuck in an
> autoreconf loop involving GNUmakefile, judging from this message:
>
> INFO: running autoreconf for new version string: 0.0.0.4-9a38-dirty
>
> Here, _curr-ver has a -dirty suffix but VERSION does not.
>
> The loop does not happen if I commit all local changes, or remove the
> sed -e 's/dirty$/modified/' invocation from configure.ac.
Does it work if you replace the GNUmakefile line
cd $(srcdir) && rm -rf autom4te.cache .version && $(_autoreconf)
with
cd $(srcdir) && rm -rf autom4te.cache .version
./config.status --recheck
?
2025-01-26 Bruno Haible <[email protected]>
bootstrap: Remove obsolete code.
Reported by Basil L. Contovounesios <[email protected]> in
<https://lists.gnu.org/archive/html/bug-gnulib/2025-01/msg00221.html>.
* top/bootstrap-funclib.sh (package): Don't look at gl_INIT_PACKAGE
invocations.
* build-aux/bootstrap: Regenerated.
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
