+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.
--------------------------------------------------------------------------------
-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
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,
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:
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:
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: