38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
|
From 41eeabcb0175659aebf6d480c43fb64310f37d9c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andrew Bartlett <abartlet@samba.org>
|
||
|
|
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 <abartlet@samba.org>
|
||
|
|
|
||
|
|
Downloaded from
|
||
|
|
https://github.com/openwrt/packages/blob/master/net/samba4/patches/005-samba-4.10-disable_gnutls_build_fix.patch
|
||
|
|
|
||
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||
|
|
---
|
||
|
|
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.11.0
|
||
|
|
|