diff options
| author | Bruno Haible <bruno@clisp.org> | 2022-08-09 23:59:40 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2022-08-09 23:59:40 +0200 |
| commit | bc3d94bb2df6fa0c766f6226814c2fc2a55ee049 (patch) | |
| tree | 7b2f7cb3b4b31b0111886de295f9741e357a7899 /pygnulib/GLTestDir.py | |
| parent | 98e7ca354a1108b0b99236e29bedbc6bfbd8593e (diff) | |
| download | gnulib-bc3d94bb2df6fa0c766f6226814c2fc2a55ee049.tar.gz | |
gnulib-tool.py: Don't do license replacements in the autoconf snippets.
* pygnulib/GLEmiter.py (GLEmiter.autoconfSnippet): Remove fileassistant
argument. Don't invoke the 'aux' transformer here. Don't produce Windows
CR-LFs on Windows.
(GLEmiter.autoconfSnippets): Remove fileassistant argument.
* pygnulib/GLImport.py (GLImport.gnulib_comp): Update all callers.
* pygnulib/GLTestDir.py (GLTestDir.execute): Likewise.
Diffstat (limited to 'pygnulib/GLTestDir.py')
| -rw-r--r-- | pygnulib/GLTestDir.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py index 746b815b49..3c4ad0b9dc 100644 --- a/pygnulib/GLTestDir.py +++ b/pygnulib/GLTestDir.py @@ -496,11 +496,11 @@ class GLTestDir(object): # those of the tests. emit += "gl_source_base='../%s'\n" % sourcebase emit += self.emiter.autoconfSnippets(modules, - moduletable, self.assistant, 1, False, False, False, + moduletable, 1, False, False, False, replace_auxdir) emit += "gl_source_base='.'" emit += self.emiter.autoconfSnippets(modules, - moduletable, self.assistant, 2, False, False, False, + moduletable, 2, False, False, False, replace_auxdir) emit += self.emiter.initmacro_end(macro_prefix) # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is @@ -614,10 +614,10 @@ class GLTestDir(object): emit += 'gl_source_base=\'%s\'\n' % sourcebase if single_configure: emit += self.emiter.autoconfSnippets(main_modules, moduletable, - self.assistant, 0, False, False, False, replace_auxdir) + 0, False, False, False, replace_auxdir) else: # if not single_configure emit += self.emiter.autoconfSnippets(modules, moduletable, - self.assistant, 1, False, False, False, replace_auxdir) + 1, False, False, False, replace_auxdir) emit += self.emiter.initmacro_end(macro_prefix) if single_configure: emit += ' gltests_libdeps=\n' @@ -631,7 +631,7 @@ class GLTestDir(object): emit += ' m4_pushdef([gl_MODULE_INDICATOR_CONDITION], ' emit += '[$gl_module_indicator_condition])\n' snippets = self.emiter.autoconfSnippets(tests_modules, moduletable, - self.assistant, 1, True, False, False, replace_auxdir) + 1, True, False, False, replace_auxdir) emit += snippets.strip() emit += ' m4_popdef([gl_MODULE_INDICATOR_CONDITION])\n' emit += self.emiter.initmacro_end('%stests' % macro_prefix) |