From 1a8405c320f115d584a9094bf5878b8cf6d58893 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Fri, 13 Apr 2012 17:53:04 +0300 Subject: wafsamba: add support for separate rules in stages bld.process_separate_rule(rule) and conf.process_separate_rule(rule) will cause WAF to import wscript__ script into current context. Files wscript__ should exist in the current directory. This can be used to provide rules specific for alternative implementations of certain libraries Autobuild-User: Alexander Bokovoy Autobuild-Date: Fri Apr 13 18:34:39 CEST 2012 on sn-devel-104 --- wscript_build | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'wscript_build') diff --git a/wscript_build b/wscript_build index e3cacbf734..eeefeb3a19 100644 --- a/wscript_build +++ b/wscript_build @@ -111,8 +111,19 @@ bld.RECURSE('libcli/samsync') bld.RECURSE('libcli/registry') bld.RECURSE('source4/lib/policy') bld.RECURSE('libcli/named_pipe_auth') -if not bld.CONFIG_SET("USING_SYSTEM_KRB5"): - bld.RECURSE('source4/heimdal_build') + +if bld.CONFIG_SET("USING_SYSTEM_KRB5"): + if bld.CONFIG_SET("HEIMDAL_KRB5_CONFIG") and bld.CONFIG_SET("KRB5_CONFIG"): + if bld.CONFIG_GET("HEIMDAL_KRB5_CONFIG") != bld.CONFIG_GET("KRB5_CONFIG"): + # When both HEIMDAL_KRB5_CONFIG and KRB5_CONFIG are set and not equal, + # it means one is Heimdal-specific (krb5-config.heimdal, for example) + # and there is system heimdal + bld.process_separate_rule('system_heimdal') + else: + bld.process_separate_rule('system_krb5') +else: + bld.process_separate_rule('embedded_heimdal') + bld.RECURSE('libcli/smbreadline') bld.RECURSE('codepages') bld.RECURSE('source4/setup') -- cgit