Merge pull request #23414 from keszybz/analyze-vercmp

[thirdparty/systemd.git] / meson.build

diff --git a/meson.build b/meson.build
index 42e746558b42c5528edec61505925dfa32238998..f416b4f234b38df241b9b5b657761e5cebe7a3ed 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -17,7 +17,7 @@ libsystemd_version = '0.34.0'
 libudev_version = '1.7.4'
 
 conf = configuration_data()
-conf.set_quoted('PROJECT_URL', 'https://www.freedesktop.org/wiki/Software/systemd')
+conf.set_quoted('PROJECT_URL', 'https://systemd.io/')
 conf.set('PROJECT_VERSION',    meson.project_version(),
          description : 'Numerical project version (used where a simple number is expected)')
 
@@ -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