]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
meson: output one "item" for DNS-over-TLS 19326/head
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 15 Apr 2021 09:04:14 +0000 (11:04 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 15 Apr 2021 09:04:40 +0000 (11:04 +0200)
meson.build

index 8a11e091898b59b2b7ef1fdadcfa4b8436921a53..bf9b343090b808ef92eecce96a6d98bd078aacf1 100644 (file)
@@ -3824,8 +3824,6 @@ foreach tuple : [
         ['xdg-autostart'],
 
         # optional features
-        ['DNS-over-TLS(gnutls)',  conf.get('DNS_OVER_TLS_USE_GNUTLS') == 1],
-        ['DNS-over-TLS(openssl)', conf.get('DNS_OVER_TLS_USE_OPENSSL') == 1],
         ['idn'],
         ['polkit'],
         ['nscd'],
@@ -3884,6 +3882,14 @@ else
         found += 'static-libudev(@0@)'.format(static_libudev)
 endif
 
+if conf.get('DNS_OVER_TLS_USE_GNUTLS') == 1
+        found += 'DNS-over-TLS(gnutls)'
+elif conf.get('DNS_OVER_TLS_USE_OPENSSL') == 1
+        found += 'DNS-over-TLS(openssl)'
+else
+        missing += 'DNS-over-TLS'
+endif
+
 status += [
         '',
         'enabled features: @0@'.format(', '.join(found)),