From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 28 Jun 2018 07:09:04 +0000 (+0900)
Subject: meson: do not compare objects of different types
X-Git-Tag: v240~1023
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48f5da19b6e8f0d05f5217bc9856093d354ce5d0;p=thirdparty%2Fsystemd.git

meson: do not compare objects of different types

This fixes the following warning:
```
meson.build:1140: WARNING: Trying to compare values of different types (DependencyHolder, list) using !=.
The result of this is undefined and will become a hard error in a future Meson release.
```

Follow-up for f02582f69fe1e7663a87ba80bd4f90d5d23ee75f(#9410).
---

diff --git a/meson.build b/meson.build
index 80f59d77d8a..dd904c71487 100644
--- a/meson.build
+++ b/meson.build
@@ -1137,7 +1137,8 @@ substs.set('DEFAULT_DNSSEC_MODE', default_dnssec)
 
 dns_over_tls = get_option('dns-over-tls')
 if dns_over_tls != 'false'
-        have = libgnutls != [] and libgnutls.version().version_compare('>=3.5.3')
+        have = (conf.get('HAVE_GNUTLS') == 1 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