From e238b17f7316cee81ad0a14754c52f26f7541c89 Mon Sep 17 00:00:00 2001 From: Fred Morcos Date: Wed, 16 Aug 2023 15:21:32 +0200 Subject: [PATCH] Meson: Cleanup ixfrdist module --- meson.build | 1 + meson/ixfrdist/meson.build | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 7be9c68451..4e26d3c5b6 100644 --- 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 315a47a71f..61e2706ca7 100644 --- 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') -- 2.47.2