From dfc45474d74f46d941165ff848c4302f99e9224a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 23 Mar 2024 18:54:19 +0100 Subject: [PATCH] gnulib-tool.py: Fix autoconf snippets inclusion if --single-configure. * pygnulib/GLTestDir.py (GLTestDir.execute): Correct the arguments passed to autoconfSnippets. --- ChangeLog | 6 ++++++ pygnulib/GLTestDir.py | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7aff2f21ab..2556563d0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-03-23 Bruno Haible + + gnulib-tool.py: Fix autoconf snippets inclusion if --single-configure. + * pygnulib/GLTestDir.py (GLTestDir.execute): Correct the arguments + passed to autoconfSnippets. + 2024-03-23 Bruno Haible gnulib-tool.py: Produce same diagnostics regardless of Automake version. diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py index c1ab923386..120186f509 100644 --- a/pygnulib/GLTestDir.py +++ b/pygnulib/GLTestDir.py @@ -630,10 +630,10 @@ class GLTestDir(object): emit += self.emitter.shellvars_init(False, sourcebase) if single_configure: emit += self.emitter.autoconfSnippets(main_modules, main_modules, moduletable, - 0, False, False, False, replace_auxdir) + 0, True, False, False, replace_auxdir) else: # if not single_configure emit += self.emitter.autoconfSnippets(modules, modules, moduletable, - 1, False, False, False, replace_auxdir) + 1, True, False, False, replace_auxdir) emit += self.emitter.initmacro_end(macro_prefix, False) if single_configure: emit += ' gltests_libdeps=\n' @@ -647,7 +647,7 @@ class GLTestDir(object): emit += ' m4_pushdef([gl_MODULE_INDICATOR_CONDITION], ' emit += '[$gl_module_indicator_condition])\n' snippets = self.emitter.autoconfSnippets(tests_modules, main_modules + tests_modules, - moduletable, 1, True, False, False, replace_auxdir) + moduletable, 0, True, False, False, replace_auxdir) emit += snippets emit += ' m4_popdef([gl_MODULE_INDICATOR_CONDITION])\n' emit += self.emitter.initmacro_end('%stests' % macro_prefix, True) -- 2.39.5