]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
meson: check whether gnutls supports TCP fast open
authorYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 25 Jun 2018 13:40:40 +0000 (22:40 +0900)
committerLukáš Nykrýn <lnykryn@redhat.com>
Mon, 14 Jan 2019 12:04:18 +0000 (13:04 +0100)
Fixes #9403

Cherry-picked from: f02582f69fe1e7663a87ba80bd4f90d5d23ee75f

README
meson.build

diff --git a/README b/README
index 2cde08c37e1c2ca7c56c7f985af329ec5bd24da6..7d06e0480085288eecfeef6e732f67835285ee34 100644 (file)
--- a/README
+++ b/README
@@ -154,6 +154,7 @@ REQUIREMENTS:
         libmicrohttpd (optional)
         libpython (optional)
         libidn2 or libidn (optional)
+        gnutls >= 3.1.4 (optional, >= 3.5.3 is necessary to support DNS-over-TLS)
         elfutils >= 158 (optional)
         polkit (optional)
         pkg-config
index ebc55872c9c554e49e5f6f271c9674c364333855..d58926c981af7b64c39c6b2a373de8cd960b65ce 100644 (file)
@@ -1148,7 +1148,7 @@ substs.set('DEFAULT_DNSSEC_MODE', default_dnssec)
 
 dns_over_tls = get_option('dns-over-tls')
 if dns_over_tls != 'false'
-        have = conf.get('HAVE_GNUTLS') == 1
+        have = libgnutls != [] and libgnutls.version().version_compare('>=3.5.3')
         if dns_over_tls == 'true' and not have
                 error('DNS-over-TLS support was requested, but dependencies are not available')
         endif