build: Allow build when --disable-gnutls is set
authorAndrew Bartlett <abartlet@samba.org>
Wed, 20 Mar 2019 00:57:50 +0000 (13:57 +1300)
committerDouglas Bagnall <dbagnall@samba.org>
Wed, 20 Mar 2019 05:25:48 +0000 (05:25 +0000)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13844

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Autobuild-User(master): Douglas Bagnall <dbagnall@samba.org>
Autobuild-Date(master): Wed Mar 20 05:25:48 UTC 2019 on sn-devel-144

lib/mscat/wscript

index 7ca9ef5..4d1f752 100644 (file)
@@ -12,7 +12,11 @@ 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)')
 
-    conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls')
+    # 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