diff options
| author | Bruno Haible <bruno@clisp.org> | 2021-12-18 11:43:20 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2021-12-18 11:43:50 -0800 |
| commit | 415fae8ddcb39d33f364c81b0f199e28c65bb539 (patch) | |
| tree | 0ca87804dfeffd6e375f513d8effdecd7b3f790a /gnulib-tool | |
| parent | 2eaf224aca7259e77aed9f78f3c4c7fa12c21da1 (diff) | |
| download | gnulib-415fae8ddcb39d33f364c81b0f199e28c65bb539.tar.gz | |
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'.
Diffstat (limited to 'gnulib-tool')
| -rwxr-xr-x | gnulib-tool | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnulib-tool b/gnulib-tool index d15c795135..0a0314e3cb 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 |