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>

diff --git a/lib/mscat/wscript b/lib/mscat/wscript
index 4d1f752a3c153e020312c0c75ae95e8e63453315..855be737e71da673319be2ac64e03603b6f21868 100644 (file)
--- 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 90b0f8f184b0196c893a334b132688abda62f63a..f46cf31eca3f45c64f4db1a840183628c7daad17 100644 (file)
--- 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)