Meson: Cleanup GSS-TSIG module

diff --git a/meson/gss-tsig/meson.build b/meson/gss-tsig/meson.build
index 238ea532d949160e70a42b11ec8bf1c0f0b29ea8..7c8a0c07a095b0b7187e3a316b1bfe23e139c06e 100644 (file)
--- a/meson/gss-tsig/meson.build
+++ b/meson/gss-tsig/meson.build
@@ -1,15 +1,21 @@
-# GSS-TSIG
-# Inputs: conf deps
+opt = get_option('experimental-gss-tsig')
 
-opt_gss_tsig = get_option('gss-tsig')
-conf.set10('GSS_TSIG', opt_gss_tsig, description: 'Whether to enable GSS-TSIG support')
+dep_krb5 = dependency('krb5', required: opt)
+dep_krb5_gssapi = dependency('krb5-gssapi', required: opt)
 
-dep_krb5 = dependency('krb5', required: opt_gss_tsig)
-dep_krb5_gssapi = dependency('krb5-gssapi', required: opt_gss_tsig)
-conf.set10('ENABLE_GSS_TSIG', dep_krb5.found() and dep_krb5_gssapi.found(), description: 'Whether we have GSS-TSIG support')
+found = dep_krb5.found() and dep_krb5_gssapi.found()
+conf.set('ENABLE_GSS_TSIG', found, description: 'GSS-TSIG')
 
-deps += dep_krb5
-deps += dep_krb5_gssapi
+summary('GSS-TSIG', found, bool_yn: true, section: 'GSS-TSIG')
+summary('Krb5', dep_krb5.version(), section: 'GSS-TSIG')
+summary('Krb5 GSSAPI', dep_krb5_gssapi.version(), section: 'GSS-TSIG')
 
-value = dep_krb5.found() and dep_krb5_gssapi.found() ? 'With krb5 ' + dep_krb5.version() + ' and krb5-gssapi ' + dep_krb5_gssapi.version() : false
-summary('GSS-TSIG', value, bool_yn: opt_gss_tsig, section: 'Configuration')
+dep_gss_tsig = dependency('', required: false)
+if found
+  dep_gss_tsig = declare_dependency(
+    dependencies: [
+      dep_krb5,
+      dep_krb5_gssapi,
+    ]
+  )
+endif

diff --git a/meson_options.txt b/meson_options.txt
index 5e364d55dd2e266374446c6c11aac54218d9a505..fab289fd47885962eba456d0b4e0ab2e579a21a0 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -14,8 +14,8 @@ option('unit-tests-backends', type: 'boolean', value: false, description: 'Build
 option('reproducible', type: 'boolean', value: false, description: 'Create reproducible builds (for distribution maintainers, makes debugging more difficult)')
 option('fuzz-targets', type: 'boolean', value: false, description: 'Enable fuzzing targets')
 option('verbose-logging', type: 'boolean', value: false, description: 'Enable verbose logging')
-option('gss-tsig', type: 'boolean', value: false, description: 'Enable GSS-TSIG support (experimental)')
 option('experimental-pkcs11', type: 'feature', value: 'disabled', description: 'PKCS11 support')
+option('experimental-gss-tsig', type: 'feature', value: 'disabled', description: 'GSS-TSIG support')
 option('socket-dir', type: 'string', value: '/var/run', description: 'Where the control socket lives')
 option('module-bind', type: 'boolean', value: true, description: 'Bind backend')
 option('module-bind-dyn', type: 'boolean', value: false, description: 'Bind backend (dynamically loadable)')

diff --git a/pdns/meson.build b/pdns/meson.build
index c16790e0c04eb4efc755eff1ad94c2e39e0d6f88..cb18b3c8f21b2f72ae7fd19e4444400556c6093a 100644 (file)
--- a/pdns/meson.build
+++ b/pdns/meson.build
@@ -223,7 +223,6 @@ libpdns = static_library(
   ragel_generator.process('dnslabeltext.rl'),
   include_directories: toplevel_includes,
   dependencies: [
-    dep_gss_tsig,
     dep_json11,
     dep_yahttp,
     libpdns_bindparser,