+2024-03-17 Collin Funk <collin.funk1@gmail.com>
+
+ gnulib-tool.py: Follow gnulib-tool changes, part 61.
+ Follow gnulib-tool change
+ 2022-01-09 Bruno Haible <bruno@clisp.org>
+ Remove influence of Automake conditionals on conditional dependencies.
+ * pygnulib/GLModuleSystem.py (GLModuleTable.transitive_closure): Don't
+ inhibit conditional dependencies processing on a module that uses an
+ Automake conditional.
+
2024-03-17 Collin Funk <collin.funk1@gmail.com>
gnulib-tool.py: Follow gnulib-tool changes, part 60.
--------------------------------------------------------------------------------
-commit 4bf9c96497946ce6f7b84f6527ed0291657cf728
-Author: Bruno Haible <bruno@clisp.org>
-Date: Sun Jan 9 15:38:51 2022 +0100
-
- Remove influence of Automake conditionals on conditional dependencies.
-
- * m4/gnulib-common.m4 (gl_CONDITIONAL): New macro.
- (gl_CONDITIONAL_HEADER): Use it instead of AM_CONDITIONAL.
- * m4/libgmp.m4 (gl_LIBGMP): Likewise.
- * modules/posix_spawn_file_actions_addfchdir-tests (configure.ac):
- Likewise.
- * modules/uchar-c++-tests (configure.ac): Likewise.
- * gnulib-tool (func_modules_transitive_closure): Don't inhibit
- conditional dependencies processing on a module that uses an Automake
- conditional.
-
---------------------------------------------------------------------------------
-
commit 9af17c55629c4cbe2facdc9edb5242136567ebba
Author: Bruno Haible <bruno@clisp.org>
Date: Sat Dec 25 14:30:57 2021 +0100
if module not in self.avoids:
outmodules += [module]
if self.config['conddeps']:
- automake_snippet = \
- module.getAutomakeSnippet_Conditional()
- pattern = re.compile('^if', re.M)
- if not self.config['gnu_make'] and not pattern.findall(automake_snippet):
- # A module whose Makefile.am snippet contains a
- # reference to an automake conditional. If we were
- # to use it conditionally, we would get an error
- # configure: error: conditional "..." was never defined.
- # because automake 1.11.1 does not handle nested
- # conditionals correctly. As a workaround, make the
- # module unconditional.
- self.addUnconditional(module)
conditional = self.isConditional(module)
dependencies = module.getDependenciesWithConditions()
depmodules = [ pair[0]