diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | gnulib-tool | 30 |
2 files changed, 24 insertions, 12 deletions
@@ -1,5 +1,11 @@ 2019-11-18 Bruno Haible <bruno@clisp.org> + gnulib-tool: Fix build error on macOS with --conditional-dependencies. + * gnulib-tool (func_modules_add_dummy): Ignore modules that are + conditionally enabled. + +2019-11-18 Bruno Haible <bruno@clisp.org> + gc: Mirror libgcrypt.m4 from libgcrypt. * config/srclistvars.sh (LIBGCRYPT): New variable. * config/srclist.txt: Use it to fetch m4/libgcrypt.m4. diff --git a/gnulib-tool b/gnulib-tool index a41522ba0e..28b5bcb71f 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -3283,18 +3283,24 @@ func_modules_add_dummy () for module in $modules; do func_verify_nontests_module if test -n "$module"; then - # Extract the value of "lib_SOURCES += ...". - for file in `func_get_automake_snippet "$module" | combine_lines | - sed -n -e 's,^lib_SOURCES[ ]*+=\([^#]*\).*$,\1,p'`; do - # Ignore .h files since they are not compiled. - case "$file" in - *.h) ;; - *) - have_lib_SOURCES=yes - break 2 - ;; - esac - done + if test "$cond_dependencies" = true && func_cond_module_p $module; then + # Ignore conditional modules, since they are not guaranteed to + # contribute to lib_SOURCES. + : + else + # Extract the value of "lib_SOURCES += ...". + for file in `func_get_automake_snippet "$module" | combine_lines | + sed -n -e 's,^lib_SOURCES[ ]*+=\([^#]*\).*$,\1,p'`; do + # Ignore .h files since they are not compiled. + case "$file" in + *.h) ;; + *) + have_lib_SOURCES=yes + break 2 + ;; + esac + done + fi fi done # Add the dummy module, to make sure the library will be non-empty. |