diff options
author | Andreas Schneider <asn@samba.org> | 2018-10-10 14:38:24 +0200 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2019-04-30 23:18:27 +0000 |
commit | 324a2eec8675b18c6f0e85a1f7f7dbccb4524189 (patch) | |
tree | c0ca9fc10e8cdf51794b0e4d770a928beff15c0f | |
parent | 1fa3c9a3cca704d9b647daa002e896f58f42d6e4 (diff) | |
download | samba-324a2eec8675b18c6f0e85a1f7f7dbccb4524189.tar.gz |
waf: Move gnutls_pkcs7_get_embedded_data_oid to main gnutls file
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r-- | lib/mscat/wscript | 6 | ||||
-rw-r--r-- | wscript_configure_system_gnutls | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/lib/mscat/wscript b/lib/mscat/wscript index 4d1f752a3c1..855be737e71 100644 --- a/lib/mscat/wscript +++ b/lib/mscat/wscript @@ -12,12 +12,6 @@ def configure(conf): if not conf.find_program('asn1Parser', var='ASN1PARSER'): Logs.warn('WARNING: ans1Parser hasn\'t been found! Please install it (e.g. libtasn1-bin)') - # GnuTLS is currently able to be disabled - if conf.env.enable_gnutls: - conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls') - else: - Logs.warn('WARNING: gnutls disabled so dumpmscat will not be built') - def build(bld): if (bld.CONFIG_SET('HAVE_LIBTASN1') and bld.env.ASN1PARSER and diff --git a/wscript_configure_system_gnutls b/wscript_configure_system_gnutls index 90b0f8f184b..f46cf31eca3 100644 --- a/wscript_configure_system_gnutls +++ b/wscript_configure_system_gnutls @@ -20,5 +20,8 @@ conf.CHECK_CFG(package='gnutls', # Define gnutls as a system library conf.SET_TARGET_TYPE('gnutls', 'SYSLIB') +# Check for gnutls_pkcs7_get_embedded_data_oid (>= 3.5.5) required by libmscat +conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls') + conf.DEFINE('HAVE_GNUTLS3', 1) conf.DEFINE('ENABLE_GNUTLS', 1) |