summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2012-04-20 12:53:11 +0300
committerSimo Sorce <idra@samba.org>2012-04-23 16:38:43 -0400
commit4291fdcf3910b37d7dc7ed3849847fb162b5569b (patch)
tree686607359b82a667316461178c3b4cf4acd7e5f2 /wscript
parent5b5b696c1e36dc7f81da24158e0853290084dec8 (diff)
downloadsamba-4291fdcf3910b37d7dc7ed3849847fb162b5569b.tar.gz
samba-4291fdcf3910b37d7dc7ed3849847fb162b5569b.tar.bz2
samba-4291fdcf3910b37d7dc7ed3849847fb162b5569b.zip
waf: move krb5 checks to a separate waf file
With PROCESS_SEPARATE_RULE in wafsamba it is now possible to simplify configuration and checks for MIT/Heimdal Kerberos implementations. 1. Move MIT krb5 checks from source3/wscript to wscript_configure_krb5 2. Make sure they are called same way (--with-mit-krb5-checks) 3. If no configure checks identified MIT krb5 in system (or were disabled), make sure Heimdal build is selected, embedded (default) or system-provided. This makes logic of configuration unchanged for Heimdal builds but adds less hacky way to use MIT krb5 builds. The latter does not work yet as we need to untangle more subsystems from HDB/Heimdal-specific details but lays out a foundation for that. Signed-off-by: Simo Sorce <idra@samba.org>
Diffstat (limited to 'wscript')
-rwxr-xr-xwscript9
1 files changed, 8 insertions, 1 deletions
diff --git a/wscript b/wscript
index 15e1ce51bf..337643621c 100755
--- a/wscript
+++ b/wscript
@@ -84,7 +84,14 @@ def configure(conf):
conf.RECURSE('dynconfig')
conf.RECURSE('lib/ldb')
- if not os.getenv('USING_SYSTEM_KRB5'):
+ 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')