Meson: Cleanup boost modules

diff --git a/meson.build b/meson.build
index e14ec1fe8752336b7cdf18c4537a21f7881cd8b2..1f22b593f366304c1d0d452aeb4e17421bb1381a 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -194,6 +194,8 @@ deps = [
   dep_libssl,
   dep_gnutls,
   dep_rt,
+  dep_boost,
+  dep_boost_program_options,
   dep_gss_tsig,
   dep_pkcs11,
   dep_yahttp,

diff --git a/meson/boost-program-options/meson.build b/meson/boost-program-options/meson.build
index 5b6b82cc2c8032b1bc8082f43d27f8461473119e..2b463546b7fbce252904a6cd86a5d98c15257c64 100644 (file)
--- a/meson/boost-program-options/meson.build
+++ b/meson/boost-program-options/meson.build
@@ -1,6 +1,2 @@
-# Boost Program Options Library
-# Inputs: deps
-
 dep_boost_program_options = dependency('boost', modules: ['program_options'], required: true)
-deps += dep_boost_program_options
 summary('Program Options', dep_boost_program_options.found(), bool_yn: true, section: 'Boost')

diff --git a/meson/boost-serialization/meson.build b/meson/boost-serialization/meson.build
index 346c8c9e2032fc9f8cc257f82eac39188e63ea7f..e83b1c5341a0d63f84504b14554b5a84b99c6c7a 100644 (file)
--- a/meson/boost-serialization/meson.build
+++ b/meson/boost-serialization/meson.build
@@ -1,5 +1,2 @@
-# Boost Serialization Library
-# Outputs: deps_boost_serialization
-
-deps_boost_serialization = dependency('boost', modules: ['serialization'], required: true)
-summary('Serialization', deps_boost_serialization.found(), bool_yn: true, section: 'Boost')
+dep_boost_serialization = dependency('boost', modules: ['serialization'], required: true)
+summary('Serialization', dep_boost_serialization.found(), bool_yn: true, section: 'Boost')

diff --git a/meson/boost/meson.build b/meson/boost/meson.build
index f8e15babe21c9e31c3a80df749f84d3d7b40e961..d8421990e8a12637bde45457b354d442815e95a7 100644 (file)
--- a/meson/boost/meson.build
+++ b/meson/boost/meson.build
@@ -1,10 +1,10 @@
-# Boost
-# Inputs: conf deps
-
 dep_boost = dependency('boost', version: '>= 1.42', required: true)
-deps += dep_boost
 # Boost accumulators, as used by dnsbulktest and dnstcpbench, need 1.48+ to be compatible
 # with C++11.
-conf.set10('HAVE_BOOST_GE_148', dep_boost.version().version_compare('>= 1.48.0'), description: 'Whether the boost version is >= 1.48.0')
-summary('Boost', dep_boost.found(), bool_yn: true, section: 'Configuration')
+conf.set(
+  'HAVE_BOOST_GE_148',
+  dep_boost.version().version_compare('>= 1.48.0'),
+  description: 'Boost version >= 1.48.0',
+)
+summary('Boost', dep_boost.found(), bool_yn: true, section: 'Boost')
 summary('Version', dep_boost.version(), section: 'Boost')