From 324a2eec8675b18c6f0e85a1f7f7dbccb4524189 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 10 Oct 2018 14:38:24 +0200 Subject: waf: Move gnutls_pkcs7_get_embedded_data_oid to main gnutls file Signed-off-by: Andreas Schneider Reviewed-by: Andrew Bartlett --- lib/mscat/wscript | 6 ------ 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) -- cgit v1.2.1