s3:libsmb: use 'state' instead of 'talloc_tos()' in smb2cli_ioctl*

[abartlet/samba.git/.git] / wscript

diff --git a/wscript b/wscript
index 6b51a37c857b8c954bf915ecf0f9b9e240d1520e..337643621c945eb450cb7fd52377023dca66620c 100755 (executable)
--- a/wscript
+++ b/wscript
@@ -84,7 +84,15 @@ def configure(conf):
 
     conf.RECURSE('dynconfig')
     conf.RECURSE('lib/ldb')
-    conf.RECURSE('source4/heimdal_build')
+    if Options.options.with_mit_krb5_checks:
+        conf.PROCESS_SEPARATE_RULE('krb5')
+    # Only process heimdal_build for non-MIT KRB5 builds
+    # When MIT KRB5 checks are done as above, conf.env.KRB5_VENDOR will be set
+    # to the lowcased output of 'krb5-config --vendor'.
+    # If it is not set or the output is 'heimdal', we are dealing with
+    # system-provided or embedded Heimdal build
+    if conf.CONFIG_GET('KRB5_VENDOR') in (None, 'heimdal'):
+        conf.RECURSE('source4/heimdal_build')
     conf.RECURSE('source4/lib/tls')
     conf.RECURSE('source4/ntvfs/sysdep')
     conf.RECURSE('lib/util')