]> Savannah Git Hosting - gnulib.git/commitdiff
stdint: Fix handling of limits.h (regression 2021-12-16).
authorBruno Haible <bruno@clisp.org>
Sat, 18 Dec 2021 19:43:20 +0000 (11:43 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 18 Dec 2021 19:43:50 +0000 (11:43 -0800)
* 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
gnulib-tool
modules/stdint

index 61f68406b4821d5996b74d237af1a2195d22b3bf..f085335235ae646c05c71c7e2bf80c026c277c5a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2021-12-18  Bruno Haible  <bruno@clisp.org>
+
+       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  Paul Eggert  <eggert@cs.ucla.edu>
 
        nstrftime: simplify by using libc-config.h.
index d15c795135a30a97c1af9bb29662945d8292d37e..0a0314e3cb4288e72c68e58788f564d35efa0a7e 100755 (executable)
@@ -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
index 3053a132e184c04ccdae4a3ba7664ee130cbe706..bdec953df5a24e948cb83f9b5e7a7febe50cd3dd 100644 (file)
@@ -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: