diff options
| author | Luca Boccassi <bluca@debian.org> | 2022-05-17 21:09:49 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-05-21 18:13:38 +0200 |
| commit | 1f9aa3d2a654531df10869aee324a687fbe5179f (patch) | |
| tree | 3018c70b40b27375378f8482a9ab8d3fcb62529c /meson.build | |
| parent | Merge pull request #23460 from keszybz/docs-redirect (diff) | |
| download | systemd-1f9aa3d2a654531df10869aee324a687fbe5179f.tar.xz systemd-1f9aa3d2a654531df10869aee324a687fbe5179f.zip | |
resolved: default to OpenSSL
If both gnutls and openssl are available, prefer openssl.
We are gradually moving toward supporting openssl only as the
crypto library, and the resolved gnutls backend will be dropped
at some point, so start nudging users toward the openssl one.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/meson.build b/meson.build index acd938d2d6..69724a1cdd 100644 --- a/meson.build +++ b/meson.build @@ -1595,20 +1595,20 @@ if dns_over_tls != 'false' error('Sorry, -Ddns-over-tls=gnutls is not supported when openssl is used as the cryptolib') endif - if dns_over_tls == 'openssl' or conf.get('PREFER_OPENSSL') == 1 - have_gnutls = false + if dns_over_tls == 'gnutls' + have_openssl = false else - have_gnutls = (conf.get('HAVE_GNUTLS') == 1 and libgnutls.version().version_compare('>= 3.6.0')) - if dns_over_tls == 'gnutls' and not have_gnutls - error('DNS-over-TLS support was requested with gnutls, but dependencies are not available') + have_openssl = conf.get('HAVE_OPENSSL') == 1 + if dns_over_tls == 'openssl' and not have_openssl + error('DNS-over-TLS support was requested with openssl, but dependencies are not available') endif endif - if dns_over_tls == 'gnutls' or have_gnutls - have_openssl = false + if dns_over_tls == 'openssl' or have_openssl + have_gnutls = false else - have_openssl = conf.get('HAVE_OPENSSL') == 1 - if dns_over_tls != 'auto' and not have_openssl - str = dns_over_tls == 'openssl' ? ' with openssl' : '' + have_gnutls = conf.get('HAVE_GNUTLS') == 1 and libgnutls.version().version_compare('>= 3.6.0') + if dns_over_tls != 'auto' and not have_gnutls + str = dns_over_tls == 'gnutls' ? ' with gnutls' : '' error('DNS-over-TLS support was requested@0@, but dependencies are not available'.format(str)) endif endif |