loadparm: Fix broken lp_ulong utility function

[mat/samba.git] / wscript_build

diff --git a/wscript_build b/wscript_build
index 25d8eff584662d9b01c8e175e8a0bf1147732ea9..ad790ca5068e8afcf3f1f47b55a356ad88a00bc1 100644 (file)
--- a/wscript_build
+++ b/wscript_build
@@ -65,6 +65,7 @@ bld.RECURSE('lib/uid_wrapper')
 bld.RECURSE('lib/popt')
 bld.RECURSE('source4/lib/stream')
 bld.RECURSE('lib/util')
+bld.RECURSE('lib/tdb_wrap')
 bld.RECURSE('lib/tdr')
 bld.RECURSE('lib/tsocket')
 bld.RECURSE('lib/crypto')
@@ -102,13 +103,27 @@ bld.RECURSE('libcli/ldap')
 bld.RECURSE('libcli/nbt')
 bld.RECURSE('libcli/netlogon')
 bld.RECURSE('libcli/auth')
+bld.RECURSE('libcli/lsarpc')
 bld.RECURSE('libcli/drsuapi')
 bld.RECURSE('libcli/echo')
+bld.RECURSE('libcli/dns')
 bld.RECURSE('libcli/samsync')
 bld.RECURSE('libcli/registry')
 bld.RECURSE('source4/lib/policy')
 bld.RECURSE('libcli/named_pipe_auth')
-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')
@@ -118,8 +133,11 @@ bld.RECURSE('lib')
 bld.RECURSE('libds/common')
 bld.RECURSE('source3')
 bld.RECURSE('dfs_server')
+bld.RECURSE('file_server')
+bld.RECURSE('utils')
 
 bld.RECURSE('testsuite/headers')
+bld.RECURSE('testsuite/libsmbclient/src')
 
 bld.SYMBOL_CHECK()
 bld.DUP_SYMBOL_CHECK()