tldap talloc_realloc

[metze/samba/wip.git] / wscript_build

diff --git a/wscript_build b/wscript_build
old mode 100644 (file)
new mode 100755 (executable)
index eeefeb3..e35ddae
--- a/wscript_build
+++ b/wscript_build
@@ -48,7 +48,6 @@ bld.RECURSE('source4/libnet')
 bld.RECURSE('source4/auth')
 bld.RECURSE('auth')
 bld.RECURSE('auth/kerberos')
-bld.RECURSE('lib/iniparser/src')
 bld.RECURSE('nsswitch')
 bld.RECURSE('nsswitch/libwbclient')
 bld.RECURSE('source4/lib/samba3')
@@ -63,6 +62,7 @@ bld.RECURSE('lib/socket_wrapper')
 bld.RECURSE('lib/nss_wrapper')
 bld.RECURSE('lib/uid_wrapper')
 bld.RECURSE('lib/popt')
+bld.RECURSE('lib/iniparser/src')
 bld.RECURSE('source4/lib/stream')
 bld.RECURSE('lib/util')
 bld.RECURSE('lib/tdb_wrap')
@@ -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')
@@ -135,9 +133,9 @@ bld.RECURSE('source3')
 bld.RECURSE('dfs_server')
 bld.RECURSE('file_server')
 bld.RECURSE('utils')
+bld.RECURSE('lib/krb5_wrap')
 
 bld.RECURSE('testsuite/headers')
-bld.RECURSE('testsuite/libsmbclient/src')
 
 bld.SYMBOL_CHECK()
 bld.DUP_SYMBOL_CHECK()