stdbit-h: Fix generated header substitutions (regr. today).

* m4/stdbit_h.m4 (gl_STDBIT_H_REQUIRE_DEFAULTS): Adjust the variable
names with 's/_GL_/_/' as expected by the Makefile.am snippet.

diff --git a/ChangeLog b/ChangeLog
index 48500da1f17310c9ce1be5e0554d04e16fa1cdd9..a7b2ab0bc9469ec2dedeb330d61a3494055f4927 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2026-03-08  Collin Funk  <collin.funk1@gmail.com>
+
+       stdbit-h: Fix generated header substitutions (regr. today).
+       * m4/stdbit_h.m4 (gl_STDBIT_H_REQUIRE_DEFAULTS): Adjust the variable
+       names with 's/_GL_/_/' as expected by the Makefile.am snippet.
+
 2026-03-08  Bruno Haible  <bruno@clisp.org>
 
        acl-permissions: Don't stump on the system namespace.

diff --git a/m4/stdbit_h.m4 b/m4/stdbit_h.m4
index 5ef58d9e2adde356f5d76cba69b967c455303c30..997c5b2bfb20167ff2e07ebaa7fef3b0d5fc6c85 100644 (file)
--- a/m4/stdbit_h.m4
+++ b/m4/stdbit_h.m4
@@ -1,5 +1,5 @@
 # stdbit_h.m4
-# serial 3
+# serial 4
 dnl Copyright 2024-2026 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -39,20 +39,20 @@ AC_DEFUN([gl_STDBIT_MODULE_INDICATOR],
 AC_DEFUN([gl_STDBIT_H_REQUIRE_DEFAULTS],
 [
   m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDBIT_H_MODULE_INDICATOR_DEFAULTS], [
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GL_STDC_LEADING_ZEROS])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GL_STDC_LEADING_ONES])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GL_STDC_TRAILING_ZEROS])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GL_STDC_TRAILING_ONES])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GL_STDC_FIRST_LEADING_ZERO])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GL_STDC_FIRST_LEADING_ONE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GL_STDC_FIRST_TRAILING_ZERO])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GL_STDC_FIRST_TRAILING_ONE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GL_STDC_COUNT_ZEROS])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GL_STDC_COUNT_ONES])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GL_STDC_HAS_SINGLE_BIT])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GL_STDC_BIT_WIDTH])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GL_STDC_BIT_FLOOR])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GL_STDC_BIT_CEIL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDC_LEADING_ZEROS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDC_LEADING_ONES])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDC_TRAILING_ZEROS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDC_TRAILING_ONES])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDC_FIRST_LEADING_ZERO])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDC_FIRST_LEADING_ONE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDC_FIRST_TRAILING_ZERO])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDC_FIRST_TRAILING_ONE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDC_COUNT_ZEROS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDC_COUNT_ONES])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDC_HAS_SINGLE_BIT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDC_BIT_WIDTH])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDC_BIT_FLOOR])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDC_BIT_CEIL])
   ])
   m4_require(GL_MODULE_INDICATOR_PREFIX[_STDBIT_H_MODULE_INDICATOR_DEFAULTS])
   AC_REQUIRE([gl_STDBIT_H_DEFAULTS])