Merge pull request #10726 from michaelolbrich/meson-fixes

Meson fixes
This commit is contained in:
Yu Watanabe
2018-11-11 23:19:50 +09:00
committed by GitHub
+5 -1
View File
@@ -1188,7 +1188,9 @@ if dns_over_tls != 'false'
endif
have = have_gnutls or have_openssl
else
have = have_gnutls = have_openssl = false
have = false
have_gnutls = false
have_openssl = false
endif
conf.set10('ENABLE_DNS_OVER_TLS', have)
conf.set10('DNS_OVER_TLS_USE_GNUTLS', have_gnutls)
@@ -2768,6 +2770,7 @@ endif
fuzzer_exes = []
if get_option('tests') != 'false'
foreach tuple : fuzzers
sources = tuple[0]
link_with = tuple[1].length() > 0 ? tuple[1] : [libshared]
@@ -2792,6 +2795,7 @@ foreach tuple : fuzzers
c_args : defs,
install : false)
endforeach
endif
run_target('fuzzers',
depends : fuzzer_exes,