This patch fixes the handling multiple gnulib-tool invocations in the stdbit-h module.
The relevant situation is when, under the same configure.ac, there are two gnulib-tool invocations, where one uses, say, the module 'stdc_count_ones' and the other one uses, say, the module 'stdc_count_zeros'. Previously, both lib/ directories would contain the code for both functions. Which is a waste of binary code size. With this patch, stdc_count_ones gets defined in the first lib/ directory only, and stdc_count_zeros gets defined in the second lib/ directory only. And with the #include_next scaffolding from Collin's proposed patch 0001, both function declarations will be visible if the package uses the appropriate -I options. 2026-03-08 Bruno Haible <[email protected]> stdbit-h: Use idioms for handling multiple gnulib-tool invocations. * lib/stdbit.in.h: Use @GNULIB_...@ instead of @GL_...@. * m4/stdbit_h.m4 (gl_STDBIT_H): Don't initialize GL_* variables. (gl_STDBIT_MODULE_INDICATOR, gl_STDBIT_H_REQUIRE_DEFAULTS, gl_STDBIT_H_DEFAULTS): New macros. * modules/stdbit-h (Makefile.am): Substitute GNULIB_* instead of GL_* variables. * modules/stdc_bit_ceil (configure.ac): Use gl_STDBIT_MODULE_INDICATOR. * modules/stdc_bit_floor (configure.ac): Likewise. * modules/stdc_bit_width (configure.ac): Likewise. * modules/stdc_count_ones (configure.ac): Likewise. * modules/stdc_count_zeros (configure.ac): Likewise. * modules/stdc_first_leading_one (configure.ac): Likewise. * modules/stdc_first_leading_zero (configure.ac): Likewise. * modules/stdc_first_trailing_one (configure.ac): Likewise. * modules/stdc_first_trailing_zero (configure.ac): Likewise. * modules/stdc_has_single_bit (configure.ac): Likewise. * modules/stdc_leading_ones (configure.ac): Likewise. * modules/stdc_leading_zeros (configure.ac): Likewise. * modules/stdc_trailing_ones (configure.ac): Likewise. * modules/stdc_trailing_zeros (configure.ac): Likewise. diff --git a/lib/stdbit.in.h b/lib/stdbit.in.h index 88f298afb9..93d9a605d9 100644 --- a/lib/stdbit.in.h +++ b/lib/stdbit.in.h @@ -281,7 +281,7 @@ __gl_stdbit_ctzll (unsigned long long int n) } #endif -#if @GL_STDC_COUNT_ONES@ +#if @GNULIB_STDC_COUNT_ONES@ /* Count 1 bits in N. */ # ifdef _GL_STDBIT_HAS_BUILTIN_POPCOUNT # define __gl_stdbit_popcount __builtin_popcount @@ -405,7 +405,7 @@ __gl_stdbit_popcountll (unsigned long long int n) /* ISO C 23 § 7.18.3 Count Leading Zeros */ -#if @GL_STDC_LEADING_ZEROS@ +#if @GNULIB_STDC_LEADING_ZEROS@ _GL_STDC_LEADING_ZEROS_INLINE unsigned int stdc_leading_zeros_ui (unsigned int n) @@ -449,7 +449,7 @@ stdc_leading_zeros_ull (unsigned long long int n) /* ISO C 23 § 7.18.4 Count Leading Ones */ -#if @GL_STDC_LEADING_ONES@ +#if @GNULIB_STDC_LEADING_ONES@ _GL_STDC_LEADING_ONES_INLINE unsigned int stdc_leading_ones_uc (unsigned char n) @@ -493,7 +493,7 @@ stdc_leading_ones_ull (unsigned long long int n) /* ISO C 23 § 7.18.5 Count Trailing Zeros */ -#if @GL_STDC_TRAILING_ZEROS@ +#if @GNULIB_STDC_TRAILING_ZEROS@ _GL_STDC_TRAILING_ZEROS_INLINE unsigned int stdc_trailing_zeros_ui (unsigned int n) @@ -537,7 +537,7 @@ stdc_trailing_zeros_ull (unsigned long long int n) /* ISO C 23 § 7.18.6 Count Trailing Ones */ -#if @GL_STDC_TRAILING_ONES@ +#if @GNULIB_STDC_TRAILING_ONES@ _GL_STDC_TRAILING_ONES_INLINE unsigned int stdc_trailing_ones_uc (unsigned char n) @@ -581,7 +581,7 @@ stdc_trailing_ones_ull (unsigned long long int n) /* ISO C 23 § 7.18.7 First Leading Zero */ -#if @GL_STDC_FIRST_LEADING_ZERO@ +#if @GNULIB_STDC_FIRST_LEADING_ZERO@ _GL_STDC_FIRST_LEADING_ZERO_INLINE unsigned int stdc_first_leading_zero_uc (unsigned char n) @@ -635,7 +635,7 @@ stdc_first_leading_zero_ull (unsigned long long int n) /* ISO C 23 § 7.18.8 First Leading One */ -#if @GL_STDC_FIRST_LEADING_ONE@ +#if @GNULIB_STDC_FIRST_LEADING_ONE@ _GL_STDC_FIRST_LEADING_ONE_INLINE unsigned int stdc_first_leading_one_uc (unsigned char n) @@ -689,7 +689,7 @@ stdc_first_leading_one_ull (unsigned long long int n) /* ISO C 23 § 7.18.9 First Trailing Zero */ -#if @GL_STDC_FIRST_TRAILING_ZERO@ +#if @GNULIB_STDC_FIRST_TRAILING_ZERO@ _GL_STDC_FIRST_TRAILING_ZERO_INLINE unsigned int stdc_first_trailing_zero_uc (unsigned char n) @@ -743,7 +743,7 @@ stdc_first_trailing_zero_ull (unsigned long long int n) /* ISO C 23 § 7.18.10 First Trailing One */ -#if @GL_STDC_FIRST_TRAILING_ONE@ +#if @GNULIB_STDC_FIRST_TRAILING_ONE@ _GL_STDC_FIRST_TRAILING_ONE_INLINE unsigned int stdc_first_trailing_one_uc (unsigned char n) @@ -797,7 +797,7 @@ stdc_first_trailing_one_ull (unsigned long long int n) /* ISO C 23 § 7.18.12 Count Ones */ -#if @GL_STDC_COUNT_ONES@ +#if @GNULIB_STDC_COUNT_ONES@ _GL_STDC_COUNT_ONES_INLINE unsigned int stdc_count_ones_ui (unsigned int n) @@ -841,7 +841,7 @@ stdc_count_ones_ull (unsigned long long int n) /* ISO C 23 § 7.18.11 Count Zeros */ -#if @GL_STDC_COUNT_ZEROS@ +#if @GNULIB_STDC_COUNT_ZEROS@ _GL_STDC_COUNT_ZEROS_INLINE unsigned int stdc_count_zeros_uc (unsigned char n) @@ -885,7 +885,7 @@ stdc_count_zeros_ull (unsigned long long int n) /* ISO C 23 § 7.18.13 Single-bit Check */ -#if @GL_STDC_HAS_SINGLE_BIT@ +#if @GNULIB_STDC_HAS_SINGLE_BIT@ _GL_STDC_HAS_SINGLE_BIT_INLINE bool stdc_has_single_bit_uc (unsigned char n) @@ -935,7 +935,7 @@ stdc_has_single_bit_ull (unsigned long long int n) /* ISO C 23 § 7.18.14 Bit Width */ -#if @GL_STDC_BIT_WIDTH@ +#if @GNULIB_STDC_BIT_WIDTH@ _GL_STDC_BIT_WIDTH_INLINE unsigned int stdc_bit_width_uc (unsigned char n) @@ -979,7 +979,7 @@ stdc_bit_width_ull (unsigned long long int n) /* ISO C 23 § 7.18.15 Bit Floor */ -#if @GL_STDC_BIT_FLOOR@ +#if @GNULIB_STDC_BIT_FLOOR@ _GL_STDC_BIT_FLOOR_INLINE unsigned char stdc_bit_floor_uc (unsigned char n) @@ -1025,7 +1025,7 @@ stdc_bit_floor_ull (unsigned long long int n) /* ISO C 23 § 7.18.16 Bit Ceiling */ -#if @GL_STDC_BIT_CEIL@ +#if @GNULIB_STDC_BIT_CEIL@ _GL_STDC_BIT_CEIL_INLINE unsigned char stdc_bit_ceil_uc (unsigned char n) diff --git a/m4/stdbit_h.m4 b/m4/stdbit_h.m4 index 517a0a8cc7..5ef58d9e2a 100644 --- a/m4/stdbit_h.m4 +++ b/m4/stdbit_h.m4 @@ -1,5 +1,5 @@ # stdbit_h.m4 -# serial 2 +# serial 3 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, @@ -18,21 +18,46 @@ AC_DEFUN_ONCE([gl_STDBIT_H] else GL_GENERATE_STDBIT_H=true fi +]) + +# gl_STDBIT_MODULE_INDICATOR([modulename]) +# sets the shell variable that indicates the presence of the given module +# to a C preprocessor expression that will evaluate to 1. +# This macro invocation must not occur in macros that are AC_REQUIREd. +AC_DEFUN([gl_STDBIT_MODULE_INDICATOR], +[ + dnl Ensure to expand the default settings once only. + gl_STDBIT_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) +]) - dnl We don't use gl_MODULE_INDICATOR_INIT_VARIABLE here, because stdbit.in.h - dnl does not use #include_next. - GL_STDC_LEADING_ZEROS=0; AC_SUBST([GL_STDC_LEADING_ZEROS]) - GL_STDC_LEADING_ONES=0; AC_SUBST([GL_STDC_LEADING_ONES]) - GL_STDC_TRAILING_ZEROS=0; AC_SUBST([GL_STDC_TRAILING_ZEROS]) - GL_STDC_TRAILING_ONES=0; AC_SUBST([GL_STDC_TRAILING_ONES]) - GL_STDC_FIRST_LEADING_ZERO=0; AC_SUBST([GL_STDC_FIRST_LEADING_ZERO]) - GL_STDC_FIRST_LEADING_ONE=0; AC_SUBST([GL_STDC_FIRST_LEADING_ONE]) - GL_STDC_FIRST_TRAILING_ZERO=0; AC_SUBST([GL_STDC_FIRST_TRAILING_ZERO]) - GL_STDC_FIRST_TRAILING_ONE=0; AC_SUBST([GL_STDC_FIRST_TRAILING_ONE]) - GL_STDC_COUNT_ZEROS=0; AC_SUBST([GL_STDC_COUNT_ZEROS]) - GL_STDC_COUNT_ONES=0; AC_SUBST([GL_STDC_COUNT_ONES]) - GL_STDC_HAS_SINGLE_BIT=0; AC_SUBST([GL_STDC_HAS_SINGLE_BIT]) - GL_STDC_BIT_WIDTH=0; AC_SUBST([GL_STDC_BIT_WIDTH]) - GL_STDC_BIT_FLOOR=0; AC_SUBST([GL_STDC_BIT_FLOOR]) - GL_STDC_BIT_CEIL=0; AC_SUBST([GL_STDC_BIT_CEIL]) +# Initializes the default values for AC_SUBSTed shell variables. +# This macro must not be AC_REQUIREd. It must only be invoked, and only +# outside of macros or in macros that are not AC_REQUIREd. +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]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_STDBIT_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_STDBIT_H_DEFAULTS]) +]) + +AC_DEFUN([gl_STDBIT_H_DEFAULTS], +[ ]) diff --git a/modules/stdbit-h b/modules/stdbit-h index bb99004177..7b820a864a 100644 --- a/modules/stdbit-h +++ b/modules/stdbit-h @@ -25,20 +25,20 @@ if GL_GENERATE_STDBIT_H stdbit.h: stdbit.in.h $(top_builddir)/config.status @NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's/@''GL_STDC_LEADING_ZEROS''@/$(GL_STDC_LEADING_ZEROS)/g' \ - -e 's/@''GL_STDC_LEADING_ONES''@/$(GL_STDC_LEADING_ONES)/g' \ - -e 's/@''GL_STDC_TRAILING_ZEROS''@/$(GL_STDC_TRAILING_ZEROS)/g' \ - -e 's/@''GL_STDC_TRAILING_ONES''@/$(GL_STDC_TRAILING_ONES)/g' \ - -e 's/@''GL_STDC_FIRST_LEADING_ZERO''@/$(GL_STDC_FIRST_LEADING_ZERO)/g' \ - -e 's/@''GL_STDC_FIRST_LEADING_ONE''@/$(GL_STDC_FIRST_LEADING_ONE)/g' \ - -e 's/@''GL_STDC_FIRST_TRAILING_ZERO''@/$(GL_STDC_FIRST_TRAILING_ZERO)/g' \ - -e 's/@''GL_STDC_FIRST_TRAILING_ONE''@/$(GL_STDC_FIRST_TRAILING_ONE)/g' \ - -e 's/@''GL_STDC_COUNT_ZEROS''@/$(GL_STDC_COUNT_ZEROS)/g' \ - -e 's/@''GL_STDC_COUNT_ONES''@/$(GL_STDC_COUNT_ONES)/g' \ - -e 's/@''GL_STDC_HAS_SINGLE_BIT''@/$(GL_STDC_HAS_SINGLE_BIT)/g' \ - -e 's/@''GL_STDC_BIT_WIDTH''@/$(GL_STDC_BIT_WIDTH)/g' \ - -e 's/@''GL_STDC_BIT_FLOOR''@/$(GL_STDC_BIT_FLOOR)/g' \ - -e 's/@''GL_STDC_BIT_CEIL''@/$(GL_STDC_BIT_CEIL)/g' \ + -e 's/@''GNULIB_STDC_LEADING_ZEROS''@/$(GNULIB_STDC_LEADING_ZEROS)/g' \ + -e 's/@''GNULIB_STDC_LEADING_ONES''@/$(GNULIB_STDC_LEADING_ONES)/g' \ + -e 's/@''GNULIB_STDC_TRAILING_ZEROS''@/$(GNULIB_STDC_TRAILING_ZEROS)/g' \ + -e 's/@''GNULIB_STDC_TRAILING_ONES''@/$(GNULIB_STDC_TRAILING_ONES)/g' \ + -e 's/@''GNULIB_STDC_FIRST_LEADING_ZERO''@/$(GNULIB_STDC_FIRST_LEADING_ZERO)/g' \ + -e 's/@''GNULIB_STDC_FIRST_LEADING_ONE''@/$(GNULIB_STDC_FIRST_LEADING_ONE)/g' \ + -e 's/@''GNULIB_STDC_FIRST_TRAILING_ZERO''@/$(GNULIB_STDC_FIRST_TRAILING_ZERO)/g' \ + -e 's/@''GNULIB_STDC_FIRST_TRAILING_ONE''@/$(GNULIB_STDC_FIRST_TRAILING_ONE)/g' \ + -e 's/@''GNULIB_STDC_COUNT_ZEROS''@/$(GNULIB_STDC_COUNT_ZEROS)/g' \ + -e 's/@''GNULIB_STDC_COUNT_ONES''@/$(GNULIB_STDC_COUNT_ONES)/g' \ + -e 's/@''GNULIB_STDC_HAS_SINGLE_BIT''@/$(GNULIB_STDC_HAS_SINGLE_BIT)/g' \ + -e 's/@''GNULIB_STDC_BIT_WIDTH''@/$(GNULIB_STDC_BIT_WIDTH)/g' \ + -e 's/@''GNULIB_STDC_BIT_FLOOR''@/$(GNULIB_STDC_BIT_FLOOR)/g' \ + -e 's/@''GNULIB_STDC_BIT_CEIL''@/$(GNULIB_STDC_BIT_CEIL)/g' \ $(srcdir)/stdbit.in.h > $@-t $(AM_V_at)mv $@-t $@ lib_SOURCES += stdbit.c diff --git a/modules/stdc_bit_ceil b/modules/stdc_bit_ceil index d08f14d088..2b020076de 100644 --- a/modules/stdc_bit_ceil +++ b/modules/stdc_bit_ceil @@ -11,7 +11,7 @@ stdc_bit_width configure.ac: AC_REQUIRE([gl_STDBIT_H]) -GL_STDC_BIT_CEIL=1 +gl_STDBIT_MODULE_INDICATOR([stdc_bit_ceil]) Makefile.am: if GL_GENERATE_STDBIT_H diff --git a/modules/stdc_bit_floor b/modules/stdc_bit_floor index 9d83bf171e..34cf4e4726 100644 --- a/modules/stdc_bit_floor +++ b/modules/stdc_bit_floor @@ -11,7 +11,7 @@ stdc_bit_width configure.ac: AC_REQUIRE([gl_STDBIT_H]) -GL_STDC_BIT_FLOOR=1 +gl_STDBIT_MODULE_INDICATOR([stdc_bit_floor]) Makefile.am: if GL_GENERATE_STDBIT_H diff --git a/modules/stdc_bit_width b/modules/stdc_bit_width index 2c2572588e..3bb887f71a 100644 --- a/modules/stdc_bit_width +++ b/modules/stdc_bit_width @@ -12,7 +12,7 @@ stdc_leading_zeros configure.ac: AC_REQUIRE([gl_STDBIT_H]) -GL_STDC_BIT_WIDTH=1 +gl_STDBIT_MODULE_INDICATOR([stdc_bit_width]) Makefile.am: if GL_GENERATE_STDBIT_H diff --git a/modules/stdc_count_ones b/modules/stdc_count_ones index 38ee1d5f67..c3cb595215 100644 --- a/modules/stdc_count_ones +++ b/modules/stdc_count_ones @@ -10,7 +10,7 @@ stdbit-h configure.ac: AC_REQUIRE([gl_STDBIT_H]) -GL_STDC_COUNT_ONES=1 +gl_STDBIT_MODULE_INDICATOR([stdc_count_ones]) Makefile.am: if GL_GENERATE_STDBIT_H diff --git a/modules/stdc_count_zeros b/modules/stdc_count_zeros index ff10513b00..1c402e4db4 100644 --- a/modules/stdc_count_zeros +++ b/modules/stdc_count_zeros @@ -11,7 +11,7 @@ stdc_count_ones configure.ac: AC_REQUIRE([gl_STDBIT_H]) -GL_STDC_COUNT_ZEROS=1 +gl_STDBIT_MODULE_INDICATOR([stdc_count_zeros]) Makefile.am: if GL_GENERATE_STDBIT_H diff --git a/modules/stdc_first_leading_one b/modules/stdc_first_leading_one index e494dc053c..3841ac56c1 100644 --- a/modules/stdc_first_leading_one +++ b/modules/stdc_first_leading_one @@ -12,7 +12,7 @@ stdc_leading_zeros configure.ac: AC_REQUIRE([gl_STDBIT_H]) -GL_STDC_FIRST_LEADING_ONE=1 +gl_STDBIT_MODULE_INDICATOR([stdc_first_leading_one]) Makefile.am: if GL_GENERATE_STDBIT_H diff --git a/modules/stdc_first_leading_zero b/modules/stdc_first_leading_zero index f72c692e2e..dfcaa69f9b 100644 --- a/modules/stdc_first_leading_zero +++ b/modules/stdc_first_leading_zero @@ -12,7 +12,7 @@ stdc_leading_ones configure.ac: AC_REQUIRE([gl_STDBIT_H]) -GL_STDC_FIRST_LEADING_ZERO=1 +gl_STDBIT_MODULE_INDICATOR([stdc_first_leading_zero]) Makefile.am: if GL_GENERATE_STDBIT_H diff --git a/modules/stdc_first_trailing_one b/modules/stdc_first_trailing_one index 41e0b70c62..e5a8472b2e 100644 --- a/modules/stdc_first_trailing_one +++ b/modules/stdc_first_trailing_one @@ -12,7 +12,7 @@ stdc_trailing_zeros configure.ac: AC_REQUIRE([gl_STDBIT_H]) -GL_STDC_FIRST_TRAILING_ONE=1 +gl_STDBIT_MODULE_INDICATOR([stdc_first_trailing_one]) Makefile.am: if GL_GENERATE_STDBIT_H diff --git a/modules/stdc_first_trailing_zero b/modules/stdc_first_trailing_zero index b194a33791..ec2ad97c0b 100644 --- a/modules/stdc_first_trailing_zero +++ b/modules/stdc_first_trailing_zero @@ -12,7 +12,7 @@ stdc_trailing_ones configure.ac: AC_REQUIRE([gl_STDBIT_H]) -GL_STDC_FIRST_TRAILING_ZERO=1 +gl_STDBIT_MODULE_INDICATOR([stdc_first_trailing_zero]) Makefile.am: if GL_GENERATE_STDBIT_H diff --git a/modules/stdc_has_single_bit b/modules/stdc_has_single_bit index f7f4459936..46bb383262 100644 --- a/modules/stdc_has_single_bit +++ b/modules/stdc_has_single_bit @@ -10,7 +10,7 @@ stdbit-h configure.ac: AC_REQUIRE([gl_STDBIT_H]) -GL_STDC_HAS_SINGLE_BIT=1 +gl_STDBIT_MODULE_INDICATOR([stdc_has_single_bit]) Makefile.am: if GL_GENERATE_STDBIT_H diff --git a/modules/stdc_leading_ones b/modules/stdc_leading_ones index 92e35181cf..04e3d71432 100644 --- a/modules/stdc_leading_ones +++ b/modules/stdc_leading_ones @@ -11,7 +11,7 @@ stdc_leading_zeros configure.ac: AC_REQUIRE([gl_STDBIT_H]) -GL_STDC_LEADING_ONES=1 +gl_STDBIT_MODULE_INDICATOR([stdc_leading_ones]) Makefile.am: if GL_GENERATE_STDBIT_H diff --git a/modules/stdc_leading_zeros b/modules/stdc_leading_zeros index 9a0bd06bd1..35ecca897c 100644 --- a/modules/stdc_leading_zeros +++ b/modules/stdc_leading_zeros @@ -10,7 +10,7 @@ stdbit-h configure.ac: AC_REQUIRE([gl_STDBIT_H]) -GL_STDC_LEADING_ZEROS=1 +gl_STDBIT_MODULE_INDICATOR([stdc_leading_zeros]) Makefile.am: if GL_GENERATE_STDBIT_H diff --git a/modules/stdc_trailing_ones b/modules/stdc_trailing_ones index 7154127062..f8c68780b8 100644 --- a/modules/stdc_trailing_ones +++ b/modules/stdc_trailing_ones @@ -11,7 +11,7 @@ stdc_trailing_zeros configure.ac: AC_REQUIRE([gl_STDBIT_H]) -GL_STDC_TRAILING_ONES=1 +gl_STDBIT_MODULE_INDICATOR([stdc_trailing_ones]) Makefile.am: if GL_GENERATE_STDBIT_H diff --git a/modules/stdc_trailing_zeros b/modules/stdc_trailing_zeros index 4572dde86e..ea4a26eb06 100644 --- a/modules/stdc_trailing_zeros +++ b/modules/stdc_trailing_zeros @@ -10,7 +10,7 @@ stdbit-h configure.ac: AC_REQUIRE([gl_STDBIT_H]) -GL_STDC_TRAILING_ZEROS=1 +gl_STDBIT_MODULE_INDICATOR([stdc_trailing_zeros]) Makefile.am: if GL_GENERATE_STDBIT_H
