Meson: Cleanup ixfrdist module

diff --git a/meson.build b/meson.build
index 7be9c68451780f43d035c59a09b59daaabacbc13..4e26d3c5b6bb9134fbf10465a339028508a62ba0 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -201,6 +201,7 @@ deps = [
   dep_backend_unittests,
   dep_dlopen,
   dep_pkcs11,
+  dep_ixfrdist,
   dep_yahttp,
   dep_json11,
   dep_systemd,

diff --git a/meson/ixfrdist/meson.build b/meson/ixfrdist/meson.build
index 315a47a71f8eccdc755b385c7dbd2e218e2cbced..61e2706ca78695d5525d921c53a449d299300a68 100644 (file)
--- a/meson/ixfrdist/meson.build
+++ b/meson/ixfrdist/meson.build
@@ -1,7 +1,10 @@
-# Ixfrdist
-# Inputs: deps conf
-
 opt_ixfrdist = get_option('tools-ixfrdist')
-deps += dependency('yaml-cpp', version: '>= 0.5', required: opt_ixfrdist)
-conf.set10('IXFRDIST', opt_ixfrdist, description: 'Whether to build ixfrdist')
-summary('Build `ixfrdist`', opt_ixfrdist, section: 'Configuration')
+dep_ixfrdist = dependency('', required: false)
+
+if opt_ixfrdist
+  dep_yaml_cpp = dependency('yaml-cpp', version: '>= 0.5', required: true)
+  dep_ixfrdist = declare_dependency(dependencies: dep_yaml_cpp)
+endif
+
+conf.set('IXFRDIST', dep_ixfrdist.found(), description: 'Whether to build ixfrdist')
+summary('Build `ixfrdist`', dep_ixfrdist.found(), bool_yn: true, section: 'Configuration')