gnulib-tool.py: Fix autoconf snippets inclusion if --single-configure.
authorBruno Haible <bruno@clisp.org>
Sat, 23 Mar 2024 17:54:19 +0000 (18:54 +0100)
committerBruno Haible <bruno@clisp.org>
Sat, 23 Mar 2024 17:54:19 +0000 (18:54 +0100)
* pygnulib/GLTestDir.py (GLTestDir.execute): Correct the arguments
passed to autoconfSnippets.

ChangeLog
pygnulib/GLTestDir.py

index 7aff2f21ab7fef4c8dd6988a27dea09d79e4e65c..2556563d0e8778d10d5c702273c05a0fc3ba93a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-03-23  Bruno Haible  <bruno@clisp.org>
+
+       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  <bruno@clisp.org>
 
        gnulib-tool.py: Produce same diagnostics regardless of Automake version.
index c1ab923386f041e3fb59f99fa263c5f772ba5943..120186f5096c6975438524215bdf7e71c3397193 100644 (file)
@@ -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)