From 698719622806a4791f635138f80942ef16f23961 Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Mon, 4 Mar 2024 21:26:08 -0800 Subject: [PATCH] gnulib-tool.py: Follow gnulib-tool changes, part 40. Follow gnulib-tool change 2021-12-18 Bruno Haible 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 | 11 +++++++++++ gnulib-tool.py.TODO | 13 ------------- pygnulib/GLEmiter.py | 8 ++++---- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 050bc7a50a..33feae3fe5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2024-03-05 Collin Funk + + gnulib-tool.py: Follow gnulib-tool changes, part 40. + Follow gnulib-tool change + 2021-12-18 Bruno Haible + 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 gnulib-tool.py: Fix incorrect tests Makefile.am generation. diff --git a/gnulib-tool.py.TODO b/gnulib-tool.py.TODO index 1cb436d90d..72cf630b54 100644 --- a/gnulib-tool.py.TODO +++ b/gnulib-tool.py.TODO @@ -319,19 +319,6 @@ Date: Sun Dec 19 12:49:16 2021 +0100 -------------------------------------------------------------------------------- -commit 415fae8ddcb39d33f364c81b0f199e28c65bb539 -Author: Bruno Haible -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 Date: Wed Dec 15 21:49:41 2021 +0100 diff --git a/pygnulib/GLEmiter.py b/pygnulib/GLEmiter.py index 9435b10666..66833c4e98 100644 --- a/pygnulib/GLEmiter.py +++ b/pygnulib/GLEmiter.py @@ -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: -- 2.39.5