>From 51fd2f6aa67c9402720c683a318dc6ed8ae2daf9 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 18 Dec 2021 14:52:18 +0100 Subject: [PATCH] stdint: Fix handling of limits.h (regression 2021-12-16). * modules/stdint (configure.ac): Revert last change. * gnulib-tool (func_emit_lib_Makefile_am, func_emit_tests_Makefile_am): If --gnu-make is used, assume that AC_SUBSTed variables for conditionals are constructed by appending the suffix '_CONDITION'. --- ChangeLog | 8 ++++++++ gnulib-tool | 8 ++++---- modules/stdint | 2 ++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07fce5e48..45a4bac3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2021-12-18 Bruno Haible + + stdint: Fix handling of limits.h (regression 2021-12-16). + * modules/stdint (configure.ac): Revert last change. + * gnulib-tool (func_emit_lib_Makefile_am, func_emit_tests_Makefile_am): + If --gnu-make is used, assume that AC_SUBSTed variables for conditionals + are constructed by appending the suffix '_CONDITION'. + 2021-12-18 Bruno Haible Fix support for --gnu-make in tests (regression 2021-12-15). diff --git a/gnulib-tool b/gnulib-tool index d15c79513..0a0314e3c 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -3775,7 +3775,7 @@ func_emit_lib_Makefile_am () echo "## begin gnulib module $module" if $gnu_make; then echo "ifeq (,\$(OMIT_GNULIB_MODULE_$module))" - convert_to_gnu_make_1='s/^if \(.*\)/ifneq (,$(\1))/' + convert_to_gnu_make_1='s/^if \(.*\)/ifneq (,$(\1_CONDITION))/' convert_to_gnu_make_2='s|%reldir%/||g' convert_to_gnu_make_3='s|%reldir%|.|g' fi @@ -3784,7 +3784,7 @@ func_emit_lib_Makefile_am () if func_cond_module_p "$module"; then func_module_conditional_name "$module" if $gnu_make; then - echo "ifneq (,\$($conditional))" + echo "ifneq (,\$(${conditional}_CONDITION))" else echo "if $conditional" fi @@ -4156,7 +4156,7 @@ func_emit_tests_Makefile_am () { echo "## begin gnulib module $module" if $gnu_make; then echo "ifeq (,\$(OMIT_GNULIB_MODULE_$module))" - convert_to_gnu_make_1='s/^if \(.*\)/ifneq (,$(\1))/' + convert_to_gnu_make_1='s/^if \(.*\)/ifneq (,$(\1_CONDITION))/' convert_to_gnu_make_2='s|%reldir%/||g' convert_to_gnu_make_3='s|%reldir%|.|g' fi @@ -4165,7 +4165,7 @@ func_emit_tests_Makefile_am () if func_cond_module_p "$module"; then func_module_conditional_name "$module" if $gnu_make; then - echo "ifneq (,\$($conditional))" + echo "ifneq (,\$(${conditional}_CONDITION))" else echo "if $conditional" fi diff --git a/modules/stdint b/modules/stdint index 3053a132e..bdec953df 100644 --- a/modules/stdint +++ b/modules/stdint @@ -21,6 +21,8 @@ sys_types configure.ac: gl_STDINT_H gl_CONDITIONAL_HEADER([stdint.h]) +dnl Because of gl_REPLACE_LIMITS_H: +gl_CONDITIONAL_HEADER([limits.h]) AC_PROG_MKDIR_P Makefile.am: -- 2.25.1