Cleanup of meson systemd integration, governed by one feature: systemd-service

diff --git a/meson.build b/meson.build
index 89560ba9613fcf44cebc6cc52d2412509e519bd2..1441300e436c6f6ad8917b8080877c4046b75540 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -135,7 +135,7 @@ deps = [
   dep_dlopen,
   dep_pkcs11,
   dep_gss_tsig,
-  dep_systemd,
+  dep_libsystemd,
   dep_arc4random,
   dep_ipcrypt,
   dep_json11,
@@ -157,7 +157,7 @@ deps = [
   dep_boost_test,
 ]
 
-if dep_systemd.found()
+if dep_libsystemd.found()
   systemd_service_conf = configuration_data()
   systemd_service_conf.set('BinDir', get_option('prefix') / get_option('bindir'))
   systemd_service_conf.set('StaticBinDir', get_option('prefix') / get_option('sbindir'))

diff --git a/meson/libsystemd/meson.build b/meson/libsystemd/meson.build
index a4649a4ff15b2f33b78b1d9a22fddafea31583de..47b447487314a7c0149839a008f234439b945766 100644 (file)
--- a/meson/libsystemd/meson.build
+++ b/meson/libsystemd/meson.build
@@ -1,9 +1,9 @@
-opt_systemd = get_option('systemd')
+opt_systemd = get_option('systemd-service')
 
-dep_systemd = dependency('libsystemd', required: opt_systemd)
-conf.set('HAVE_SYSTEMD', dep_systemd.found(), description: 'libsystemd')
-summary('libsystemd', dep_systemd.found(), bool_yn: true, section: 'Configuration')
+dep_libsystemd = dependency('libsystemd', required: opt_systemd)
+conf.set('HAVE_SYSTEMD', dep_libsystemd.found(), description: 'libsystemd')
+summary('libsystemd', dep_libsystemd.found(), bool_yn: true, section: 'Configuration')
 
-if dep_systemd.found()
-  summary('Lib Version', dep_systemd.version(), section: 'Systemd')
+if dep_libsystemd.found()
+  summary('Lib Version', dep_libsystemd.version(), section: 'Systemd')
 endif

diff --git a/meson/systemd/meson.build b/meson/systemd/meson.build
index 3cb01131447ac68e89f12705e1170d53c4a350cc..ca97f334b5fdc18362fe5d23b71f96fb4fb2658f 100644 (file)
--- a/meson/systemd/meson.build
+++ b/meson/systemd/meson.build
@@ -1,4 +1,6 @@
-dep_systemd_prog = dependency('systemd', required: false)
+opt_systemd = get_option('systemd-service')
+
+dep_systemd_prog = dependency('systemd', required: opt_systemd)
 summary('Systemd', dep_systemd_prog.found(), bool_yn: true, section: 'Configuration')
 
 # Map systemd features to systemd/systemctl version.

diff --git a/meson_options.txt b/meson_options.txt
index 614946726fd07c2b5e711c77ad81393b7e90dcf8..930da3fcb792b49520dca3ce9332d569521ecb32 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -36,7 +36,7 @@ option('module-lua2', type: 'combo', choices: ['disabled', 'static', 'dynamic'],
 option('tools', type: 'boolean', value: false, description: 'Build extra tools')
 option('tools-ixfrdist', type: 'boolean', value: false, description: 'Build ixfrdist')
 option('lua-records', type: 'boolean', value: true, description: 'Support Lua records')
-option('systemd', type: 'feature', value: 'auto', description: 'Systemd notification (requires libsystemd)')
+option('systemd-service', type: 'feature', value: 'auto', description: 'Systemd integration (requires libsystemd)')
 option('systemd-service-user', type: 'string', value: 'pdns', description: 'Systemd service user (setuid and unit file; user is not created)')
 option('systemd-service-group', type: 'string', value: 'pdns', description: 'Systemd service group (setgid and unit file; group is not created)')
 option('auto-var-init', type: 'combo', value: 'disabled', choices: ['zero', 'pattern', 'disabled'], description: 'Enable initialization of automatic variables')

diff --git a/modules/lmdbbackend/meson.build b/modules/lmdbbackend/meson.build
index a53ef2948894a906a149ec340d220839ce47fe3d..6280caf1f5c36b122412a807c68e589ac750deda 100644 (file)
--- a/modules/lmdbbackend/meson.build
+++ b/modules/lmdbbackend/meson.build
@@ -6,4 +6,4 @@ module_extras = files(
   'lmdbbackend.hh',
 )
 
-module_deps = [deps, dep_lmdb_safe, dep_lmdb, dep_boost_serialization, dep_systemd]
+module_deps = [deps, dep_lmdb_safe, dep_lmdb, dep_boost_serialization, dep_libsystemd]

diff --git a/pdns/dnsdistdist/meson.build b/pdns/dnsdistdist/meson.build
index da0e592318934c7daa1604f0038448766c4e89be..bb3a0c14f595af74686f239a0e0dafbeb87965f5 100644 (file)
--- a/pdns/dnsdistdist/meson.build
+++ b/pdns/dnsdistdist/meson.build
@@ -411,7 +411,7 @@ tools = {
       dep_lua,
       dep_protozero,
       dep_json11,
-      dep_systemd,
+      dep_libsystemd,
       dep_yahttp,
     ],
     'install': true,
@@ -607,7 +607,7 @@ if get_option('man-pages') and python.found()
   endif
 endif
 
-if dep_systemd_prog.found()
+if dep_libsystemd.found()
 
   systemd_system_unit_dir = dep_systemd_prog.get_variable(
     'systemdsystemunitdir',
@@ -753,4 +753,4 @@ if python.found()
     # args mentioned in command line become auto-dependency
     command: ['echo', 'Generated', html_docs, docs_tarball, pdf_docs],
   )
-endif
\ No newline at end of file
+endif

diff --git a/pdns/dnsdistdist/meson_options.txt b/pdns/dnsdistdist/meson_options.txt
index 80361de207f900ba38144507707f6aaadf4dda7c..1e91d47d0c2d249a9e6a317c8cc8a033239c5dda 100644 (file)
--- a/pdns/dnsdistdist/meson_options.txt
+++ b/pdns/dnsdistdist/meson_options.txt
@@ -20,7 +20,7 @@ option('dns-over-http3', type: 'boolean', value: false, description: 'Enable DNS
 option('dns-over-quic', type: 'boolean', value: false, description: 'Enable DNS over QUIC')
 option('unit-tests', type: 'boolean', value: false, description: 'Build and run unit tests')
 option('reproducible', type: 'boolean', value: false, description: 'Reproducible builds (for distro maintainers, makes debugging difficult)')
-option('systemd', type: 'feature', value: 'auto', description: 'Systemd notification (requires libsystemd)')
+option('systemd-service', type: 'feature', value: 'auto', description: 'Systemd integration (requires libsystemd)')
 option('systemd-service-user', type: 'string', value: 'dnsdist', description: 'Systemd service user (setuid and unit file; user is not created)')
 option('systemd-service-group', type: 'string', value: 'dnsdist', description: 'Systemd service group (setgid and unit file; group is not created)')
 option('auto-var-init', type: 'combo', value: 'disabled', choices: ['zero', 'pattern', 'disabled'], description: 'Enable initialization of automatic variables')

diff --git a/pdns/recursordist/meson.build b/pdns/recursordist/meson.build
index 75ca0664f1c3b828d7580c747eb5e249eed3930a..e73272f2eaf1749f2842cf8ac55fe5772ec701e3 100644 (file)
--- a/pdns/recursordist/meson.build
+++ b/pdns/recursordist/meson.build
@@ -440,7 +440,7 @@ tools = {
       dep_json11,
       dep_recrust,
       dep_rust_recrust,
-      dep_systemd,
+      dep_libsystemd,
       librec_signers_openssl,
       librec_signers_sodium,
       dep_pubsuffix,
@@ -633,7 +633,7 @@ if python.found()
   endif
 endif
 
-if dep_systemd.found()
+if dep_libsystemd.found()
   systemd_system_unit_dir = dep_systemd_prog.get_variable(
     'systemdsystemunitdir',
   )

diff --git a/pdns/recursordist/meson_options.txt b/pdns/recursordist/meson_options.txt
index 71073527c206badfd66bebffbf32095ce436906d..af61bd80238a2e2d33502d12829259d8e9b8c78f 100644 (file)
--- a/pdns/recursordist/meson_options.txt
+++ b/pdns/recursordist/meson_options.txt
@@ -13,7 +13,7 @@ option('unit-tests', type: 'boolean', value: false, description: 'Build and run
 # not relevant for rec, but accessed by boost meson.build
 option('unit-tests-backends', type: 'boolean', value: false, description: 'Build and run backend unit tests')
 option('reproducible', type: 'boolean', value: false, description: 'Reproducible builds (for distro maintainers, makes debugging difficult)')
-option('systemd', type: 'feature', value: 'auto', description: 'Systemd notification (requires libsystemd)')
+option('systemd-service', type: 'feature', value: 'auto', description: 'Systemd integration (requires libsystemd)')
 option('systemd-service-user', type: 'string', value: 'pdns', description: 'Systemd service user (setuid and unit file; user is not created)')
 option('systemd-service-group', type: 'string', value: 'pdns', description: 'Systemd service group (setgid and unit file; group is not created)')
 option('auto-var-init', type: 'combo', value: 'disabled', choices: ['zero', 'pattern', 'disabled'], description: 'Enable initialization of automatic variables')

diff --git a/tasks.py b/tasks.py
index 158b0996e294b9c244ff12335da53751bab76e90..8323439ebd7fad1f16b17b7b1f9ea1ac7b03849f 100644 (file)
--- a/tasks.py
+++ b/tasks.py
@@ -602,7 +602,7 @@ def ci_rec_configure_meson(c, features, build_dir):
             "-D dns-over-tls=false",
             "-D dnstap=disabled",
             "-D nod=false",
-            "-D systemd=disabled",
+            "-D system-service=disabled",
             "-D lua=luajit",
             "-D libcap=disabled",
             "-D libcurl=disabled",
@@ -775,7 +775,7 @@ def ci_dnsdist_configure_meson(features, additional_flags, additional_ld_flags,
                       -D lmdb=enabled \
                       -D nghttp2=enabled \
                       -D re2=enabled \
-                      -D systemd=enabled \
+                      -D systemd-service=enabled \
                       -D tls-gnutls=enabled \
                       -D dns-over-https=true \
                       -D dns-over-http3=true \
@@ -795,7 +795,7 @@ def ci_dnsdist_configure_meson(features, additional_flags, additional_ld_flags,
                       -D lmdb=disabled \
                       -D nghttp2=disabled \
                       -D re2=disabled \
-                      -D systemd=disabled \
+                      -D systemd-service=disabled \
                       -D tls-gnutls=disabled \
                       -D dns-over-https=false \
                       -D dns-over-http3=false \