yetangitu/deltachat-core
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-core.git synced 2025-10-06 03:50:08 +02:00
Code Issues Releases Wiki Activity

Merge pull request #378 from flub/netpgp-fallbacks

Browse source 
Fix usage of netpgp fallback libs
This commit is contained in:
björn petersen 2018-10-10 13:30:50 +02:00 • committed by GitHub
commit d7055d088a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libs/netpgp/meson.build
View file

@ -19,7 +19,8 @@ config_h = configuration_data()
config_h.set_quoted('PACKAGE_BUGREPORT',
'Floris Bruynooghe <flub+delta@devork.be>')
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()