[SCM] Samba Shared Repository - branch master updated

[Douglas Bagnall]

The branch, master has been updated
       via  a40b0f452af build: Allow build when --disable-gnutls is set
      from  944c577a96f s3: smbd: Clarify POSIX name handling in SMB2 get/setinfo calls.

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a40b0f452af5f393aa33c9d52673994effd0e31f
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Mar 20 13:57:50 2019 +1300

    build: Allow build when --disable-gnutls is set
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13844
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    
    Autobuild-User(master): Douglas Bagnall <dbagnall at samba.org>
    Autobuild-Date(master): Wed Mar 20 05:25:48 UTC 2019 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 lib/mscat/wscript | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

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


-- 
Samba Shared Repository