From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 15 Apr 2021 09:04:14 +0000 (+0200)
Subject: meson: output one "item" for DNS-over-TLS
X-Git-Tag: v249-rc1~405^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=237f2da9d4190f448ac955c593cbd085ea0d0f04;p=thirdparty%2Fsystemd.git

meson: output one "item" for DNS-over-TLS
---

diff --git a/meson.build b/meson.build
index 8a11e091898..bf9b343090b 100644
--- a/meson.build
+++ b/meson.build
@@ -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)),