Define HAVE_BOOST_CONTAINER_FLAT_SET_HPP if relevant, fix systemd dep

diff --git a/meson/boost/meson.build b/meson/boost/meson.build
index 943f0c4d803686822215c8641f520e4a609898fa..86507537060cad55e1bffe39a889fa7f56d16c2e 100644 (file)
--- a/meson/boost/meson.build
+++ b/meson/boost/meson.build
@@ -3,6 +3,7 @@ dep_boost = dependency('boost', version: '>= 1.42', required: true)
 # with C++11.
 have_boost_1_48_0 = dep_boost.version().version_compare('>= 1.48.0')
 conf.set('HAVE_BOOST_GE_148', have_boost_1_48_0, description: 'Boost version >= 1.48.0')
+conf.set('HAVE_BOOST_CONTAINER_FLAT_SET_HPP', have_boost_1_48_0, description: 'Boost version >= 1.48.0 has boost::container::flat_set')
 # conf.set('BOOST_CONTAINER_USE_STD_EXCEPTIONS', true, description: 'Boost use std exceptions')
 add_project_arguments('-DBOOST_CONTAINER_USE_STD_EXCEPTIONS', language: ['c', 'cpp'])
 summary('Boost', dep_boost.found(), bool_yn: true, section: 'Boost')

diff --git a/pdns/recursordist/meson.build b/pdns/recursordist/meson.build
index 6b868e0c9d067087edc49f0a5f53c408e9de1278..0280e3384e7d5d4431500fe3c202090d7be9652c 100644 (file)
--- a/pdns/recursordist/meson.build
+++ b/pdns/recursordist/meson.build
@@ -372,6 +372,7 @@ tools = {
       dep_json11,
       dep_settings,
       dep_rust_settings,
+      dep_systemd,
       libpdns_signers_openssl,
       libpdns_signers_decaf,
       libpdns_signers_sodium,