diff options
| author | Bruno Haible <bruno@clisp.org> | 2022-01-09 15:38:51 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2022-01-09 15:38:51 +0100 |
| commit | 4bf9c96497946ce6f7b84f6527ed0291657cf728 (patch) | |
| tree | e77ed554559028af398d39ea68811516ff8ad2fe /gnulib-tool | |
| parent | 1cc82c4280bb76f677f3604bdef7116922d77511 (diff) | |
| download | gnulib-4bf9c96497946ce6f7b84f6527ed0291657cf728.tar.gz | |
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.
Diffstat (limited to 'gnulib-tool')
| -rwxr-xr-x | gnulib-tool | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/gnulib-tool b/gnulib-tool index 455d97d9e6..99854415ba 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -3114,17 +3114,6 @@ func_modules_transitive_closure () if func_acceptable $module; then func_append outmodules " $module" if test "$cond_dependencies" = true; then - if ! $gnu_make \ - && func_get_automake_snippet_conditional $module \ - | grep '^if ' > /dev/null; then - # 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. - func_uncond_add_module $module - fi if func_cond_module_p $module; then conditional=true else |