From: Collin Funk Date: Sun, 8 Mar 2026 19:51:41 +0000 (-0700) Subject: stdbit-h: Fix generated header substitutions (regr. today). X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbc80047d2d7fc387a80fd1b88c3cebc8dd6f6fb;p=thirdparty%2Fgnulib.git 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 48500da1f1..a7b2ab0bc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2026-03-08 Collin Funk + + 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 acl-permissions: Don't stump on the system namespace. diff --git a/m4/stdbit_h.m4 b/m4/stdbit_h.m4 index 5ef58d9e2a..997c5b2bfb 100644 --- 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])