diff options
| author | Alexander Bokovoy <ab@samba.org> | 2012-04-20 12:53:11 +0300 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2012-04-23 16:38:43 -0400 |
| commit | 4291fdcf3910b37d7dc7ed3849847fb162b5569b (patch) | |
| tree | 686607359b82a667316461178c3b4cf4acd7e5f2 /wscript_build | |
| parent | 5b5b696c1e36dc7f81da24158e0853290084dec8 (diff) | |
| download | samba-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_build')
| -rw-r--r-- | wscript_build | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/wscript_build b/wscript_build index ad790ca506..717d8b0a1a 100644 --- a/wscript_build +++ b/wscript_build @@ -95,7 +95,6 @@ bld.RECURSE('libcli/smb') bld.RECURSE('libcli/util') bld.RECURSE('libcli/cldap') bld.RECURSE('lib/subunit/c') -bld.RECURSE('source4/kdc') bld.RECURSE('lib/smbconf') bld.RECURSE('lib/async_req') bld.RECURSE('libcli/security') @@ -112,17 +111,16 @@ bld.RECURSE('libcli/registry') bld.RECURSE('source4/lib/policy') bld.RECURSE('libcli/named_pipe_auth') -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') +if bld.CONFIG_GET('KRB5_VENDOR') in (None, 'heimdal'): + if bld.CONFIG_GET("HEIMDAL_KRB5_CONFIG") and bld.CONFIG_GET("USING_SYSTEM_KRB5"): + # 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') + bld.PROCESS_SEPARATE_RULE('embedded_heimdal') else: - bld.PROCESS_SEPARATE_RULE('embedded_heimdal') + bld.PROCESS_SEPARATE_RULE('system_mitkrb5') bld.RECURSE('libcli/smbreadline') bld.RECURSE('codepages') |