From a0d0df3eaeceaebd294582ed012e06633d567f85 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 20 Mar 2019 13:57:50 +1300 Subject: [PATCH] build: Allow build when --disable-gnutls is set BUG: https://bugzilla.samba.org/show_bug.cgi?id=13844 Signed-off-by: Andrew Bartlett Reviewed-by: Douglas Bagnall Autobuild-User(master): Douglas Bagnall Autobuild-Date(master): Wed Mar 20 05:25:48 UTC 2019 on sn-devel-144 (cherry picked from commit a40b0f452af5f393aa33c9d52673994effd0e31f) --- lib/mscat/wscript | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 -- 2.17.1