]> Savannah Git Hosting - gnulib.git/commitdiff
bootstrap: Remove obsolete code.
authorBruno Haible <bruno@clisp.org>
Sun, 26 Jan 2025 03:29:59 +0000 (04:29 +0100)
committerBruno Haible <bruno@clisp.org>
Sun, 26 Jan 2025 03:29:59 +0000 (04:29 +0100)
Reported by Basil L. Contovounesios <basil@contovou.net> 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.

ChangeLog
build-aux/bootstrap
top/bootstrap-funclib.sh

index e909e9abcf3e70c0ec56f0a95a63b9ee415f062c..6f6fa30b13feb54298398ddd7e8330d304f555f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2025-01-26  Bruno Haible  <bruno@clisp.org>
+
+       bootstrap: Remove obsolete code.
+       Reported by Basil L. Contovounesios <basil@contovou.net> 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.
+
 2025-01-24  Collin Funk  <collin.funk1@gmail.com>
 
        ptsname_r: Work around ptsname_r bug on Solaris 11 OmniOS.
index 8e15db3bf3cbb6aeaf573206d8d2b0b68756a4f9..fbbf76f5787ee92fdb5d905a3862fa0f56a3ca4f 100755 (executable)
@@ -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
index 1810a5c783505a21bfae5e1b90b55dec3b319e0f..ba531140178a35ccb1dc62442d0e64e8dc164d98 100644 (file)
@@ -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