From 9376407564087d3391a177cc64bf9b5f8b3bfe92 Mon Sep 17 00:00:00 2001 From: Floris Bruynooghe Date: Tue, 9 Oct 2018 16:38:25 -0700 Subject: [PATCH] Fix usage of netpgp fallback libs We can not use cc.has_header() when using a fallback, but we know the fallback so can just set things correctly for it. fixes #350 --- libs/netpgp/meson.build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/netpgp/meson.build b/libs/netpgp/meson.build index 1ec646a7..15479b4c 100644 --- a/libs/netpgp/meson.build +++ b/libs/netpgp/meson.build @@ -19,7 +19,8 @@ config_h = configuration_data() config_h.set_quoted('PACKAGE_BUGREPORT', 'Floris Bruynooghe ') config_h.set_quoted('PACKAGE_VERSION', meson.project_version()) -config_h.set('HAVE_ZLIB_H', cc.has_header('zlib.h', dependencies: zlib)) +config_h.set('HAVE_ZLIB_H', zlib.type_name() == 'internal' + or cc.has_header('zlib.h', dependencies: zlib)) config_h.set('HAVE_BZLIB_H', not get_option('bzip2').disabled() and cc.has_header('bzlib.h', dependencies: bzip2)) @@ -56,7 +57,9 @@ ssl_headers = [ ['openssl/sha.h', 'HAVE_OPENSSL_SHA_H'], ] foreach hdr: ssl_headers - config_h.set(hdr.get(1), cc.has_header(hdr.get(0), dependencies: openssl)) + config_h.set(hdr.get(1), + openssl.type_name() == 'internal' + or cc.has_header(hdr.get(0), dependencies: openssl)) endforeach if (get_option('openssl-camellia').enabled()