]> Savannah Git Hosting - gnulib.git/commitdiff
gnulib-tool.py: Follow gnulib-tool changes, part 40.
authorCollin Funk <collin.funk1@gmail.com>
Tue, 5 Mar 2024 05:26:08 +0000 (21:26 -0800)
committerBruno Haible <bruno@clisp.org>
Tue, 5 Mar 2024 23:10:17 +0000 (00:10 +0100)
Follow gnulib-tool change
2021-12-18  Bruno Haible  <bruno@clisp.org>
stdint: Fix handling of limits.h (regression 2021-12-16).

* pygnulib/GLEmiter.py (GLEmiter.lib_Makefile_am)
(GLEmiter.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.py.TODO
pygnulib/GLEmiter.py

index 050bc7a50ac15ac4b9a33ea81962a2c38749abc6..33feae3fe573f8c086e94de90a25be5f73d9f533 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2024-03-05  Collin Funk  <collin.funk1@gmail.com>
+
+       gnulib-tool.py: Follow gnulib-tool changes, part 40.
+       Follow gnulib-tool change
+       2021-12-18  Bruno Haible  <bruno@clisp.org>
+       stdint: Fix handling of limits.h (regression 2021-12-16).
+       * pygnulib/GLEmiter.py (GLEmiter.lib_Makefile_am)
+       (GLEmiter.tests_Makefile_am): If --gnu-make is used, assume that
+       AC_SUBSTed variables for conditionals are constructed by appending the
+       suffix '_CONDITION'.
+
 2024-03-05  Collin Funk  <collin.funk1@gmail.com>
 
        gnulib-tool.py: Fix incorrect tests Makefile.am generation.
index 1cb436d90dcc13541b094068aa071a89be37b20b..72cf630b54551bbdb2d677c34501f95577e8e259 100644 (file)
@@ -319,19 +319,6 @@ Date:   Sun Dec 19 12:49:16 2021 +0100
 
 --------------------------------------------------------------------------------
 
-commit 415fae8ddcb39d33f364c81b0f199e28c65bb539
-Author: Bruno Haible <bruno@clisp.org>
-Date:   Sat Dec 18 11:43:20 2021 -0800
-
-    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'.
-
---------------------------------------------------------------------------------
-
 commit b8124d982f454b8526b5e11934a2f71faac2b600
 Author: Bruno Haible <bruno@clisp.org>
 Date:   Wed Dec 15 21:49:41 2021 +0100
index 9435b10666180931d2979d5433d062c7ba5beae8..66833c4e98b490744ae8c0a5e93e4e9980c5cb05 100644 (file)
@@ -641,7 +641,7 @@ AC_DEFUN([%V1%_LIBSOURCES], [
         module_indicator_prefix = self.config.getModuleIndicatorPrefix()
         ac_version = self.config['ac_version']
         destfile = os.path.normpath(destfile)
-        convert_to_gnu_make_1 = (re.compile(r'^if (.*)', re.MULTILINE), r'ifneq (,$(\1))')
+        convert_to_gnu_make_1 = (re.compile(r'^if (.*)', re.MULTILINE), r'ifneq (,$(\1_CONDITION))')
         emit = ''
 
         # When using GNU make, or when creating an includable Makefile.am snippet,
@@ -719,7 +719,7 @@ AC_DEFUN([%V1%_LIBSOURCES], [
                         if moduletable.isConditional(module):
                             name = module.getConditionalName()
                             if gnu_make:
-                                allsnippets += 'ifneq (,$(%s))\n' % name
+                                allsnippets += 'ifneq (,$(%s_CONDITION))\n' % name
                             else:
                                 allsnippets += 'if %s\n' % name
                     if gnu_make:
@@ -939,7 +939,7 @@ AC_DEFUN([%V1%_LIBSOURCES], [
         ac_version = self.config['ac_version']
         libtests = self.config['libtests']
         single_configure = self.config['single_configure']
-        convert_to_gnu_make_1 = (re.compile(r'^if (.*)', re.MULTILINE), r'ifneq (,$(\1))')
+        convert_to_gnu_make_1 = (re.compile(r'^if (.*)', re.MULTILINE), r'ifneq (,$(\1_CONDITION))')
         emit = ''
 
         if libtool:
@@ -1015,7 +1015,7 @@ AC_DEFUN([%V1%_LIBSOURCES], [
                         if moduletable.isConditional(module):
                             name = module.getConditionalName()
                             if gnu_make:
-                                snippet += 'ifneq (,$(%s))\n' % name
+                                snippet += 'ifneq (,$(%s_CONDITION))\n' % name
                             else:
                                 snippet += 'if %s\n' % name
                     if gnu_make: