gnulib-tool.sh: Accept conditional dependencies with tests.

* gnulib-tool.sh (func_import): Don't reject the combination of
gl_CONDITIONAL_DEPENDENCIES and gl_WITH_TESTS.

diff --git a/ChangeLog b/ChangeLog
index 9edb2fac9ca3d8d3c922a050460b4db27c734207..441012e5a79503a149220dcee50d31421e9b581a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-04-12  Bruno Haible  <bruno@clisp.org>
+
+       gnulib-tool.sh: Accept conditional dependencies with tests.
+       * gnulib-tool.sh (func_import): Don't reject the combination of
+       gl_CONDITIONAL_DEPENDENCIES and gl_WITH_TESTS.
+
 2024-04-11  Bruno Haible  <bruno@clisp.org>
 
        gnulib-tool.py: Optimize module set lookups.

diff --git a/gnulib-tool.sh b/gnulib-tool.sh
index 507607376f32aefbabd518122b26a56bae69621a..5f0c6f530e4c005ee581b66beb54b532d2998458 100755 (executable)
--- a/gnulib-tool.sh
+++ b/gnulib-tool.sh
@@ -5278,11 +5278,6 @@ func_import ()
     if test -z "$vc_files"; then
       vc_files="$cached_vc_files"
     fi
-    # Ensure constraints.
-    if test "$cond_dependencies" = true && $inctests; then
-      echo "gnulib-tool: option --conditional-dependencies is not supported with --with-tests" 1>&2
-      func_exit 1
-    fi
   fi
   # --without-*-tests options are not supported here.
   excl_cxx_tests=