Remove rudundent check for gnutls_pkcs7_get_embedded_data_oid as we now require GnuTL...

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/lib/mscat/wscript b/lib/mscat/wscript
index 855be737e71da673319be2ac64e03603b6f21868..00eb1d4586150107730ae3bbec0785f2a1fabcf2 100644 (file)
--- a/lib/mscat/wscript
+++ b/lib/mscat/wscript
@@ -14,8 +14,7 @@ def configure(conf):
 
 def build(bld):
     if (bld.CONFIG_SET('HAVE_LIBTASN1') and
-        bld.env.ASN1PARSER and
-        bld.CONFIG_SET('HAVE_GNUTLS_PKCS7_GET_EMBEDDED_DATA_OID')):
+        bld.env.ASN1PARSER):
 
         bld.SAMBA_GENERATOR('MSCAT_PARSER',
                             source='mscat.asn',

diff --git a/wscript_configure_system_gnutls b/wscript_configure_system_gnutls
index 503c79bea2538749eced48215deff2e26f5dcacb..014e96446f607a2cb887c3e1d7d0b38688d3762d 100644 (file)
--- a/wscript_configure_system_gnutls
+++ b/wscript_configure_system_gnutls
@@ -23,9 +23,6 @@ gnutls_version = parse_version(gnutls_version_str)
 # 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')
-
 # Check for gnutls_aead_cipher_encryptv2
 #
 # This is available since version 3.6.10, but 3.6.10 has a bug which got fixed