From 27c691e1bc2430c77f488f2806aab4fb0501e4b5 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 12 Apr 2024 15:14:43 +0200 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ gnulib-tool.sh | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9edb2fac9c..441012e5a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-04-12 Bruno Haible + + 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 gnulib-tool.py: Optimize module set lookups. diff --git a/gnulib-tool.sh b/gnulib-tool.sh index 507607376f..5f0c6f530e 100755 --- 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= -- 2.39.5