s4-s3-upgrade: Max/min password age policy is in seconds, not days

[kai/samba-autobuild/.git] / wscript

diff --git a/wscript b/wscript
index e64e50902a233f6641cecc4ab5d9e6ab8960a03a..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')
@@ -123,6 +131,13 @@ def configure(conf):
     del(conf.env.defines['PYTHONDIR'])
     del(conf.env.defines['PYTHONARCHDIR'])
 
+    if not conf.CHECK_CODE('#include "tests/summary.c"',
+                           define='SUMMARY_PASSES',
+                           addmain=False,
+                           execute=True,
+                           msg='Checking configure summary'):
+        raise Utils.WafError('configure summary failed')
+    
     conf.SAMBA_CONFIG_H('include/config.h')