summaryrefslogtreecommitdiff
path: root/lib/mscat
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2019-03-20 13:57:50 +1300
committerDouglas Bagnall <dbagnall@samba.org>2019-03-20 05:25:48 +0000
commita40b0f452af5f393aa33c9d52673994effd0e31f (patch)
tree56e666079085f28a714596564dc4b8b9dd5cd502 /lib/mscat
parent944c577a96fd58634f21bda75deb52a4fb9a6d8e (diff)
downloadsamba-a40b0f452af5f393aa33c9d52673994effd0e31f.tar.gz
build: Allow build when --disable-gnutls is set
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
Diffstat (limited to 'lib/mscat')
-rw-r--r--lib/mscat/wscript6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/mscat/wscript b/lib/mscat/wscript
index 7ca9ef567ee..4d1f752a3c1 100644
--- a/lib/mscat/wscript
+++ b/lib/mscat/wscript
@@ -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