X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=wscript_build;h=65b5e301774d91e6ac6db83348a0f4e86587f127;hb=3ac2d4b59eff58f06af1eef19cef0d444f4257ca;hp=59ba354d48c981d3dc0a2fac8b8fb95dc6ccf097;hpb=89961ca2972b087ae4a974ce223b75263ec1ee1f;p=obnox%2Fsamba%2Fsamba-obnox.git

diff --git a/wscript_build b/wscript_build
index 59ba354d48c..65b5e301774 100644
--- a/wscript_build
+++ b/wscript_build
@@ -2,6 +2,7 @@
 
 # top level waf build script for samba4
 
+import Options
 import os
 srcdir = "."
 
@@ -38,11 +39,8 @@ bld.RECURSE('lib/replace')
 bld.RECURSE('lib/socket')
 bld.RECURSE('lib/talloc')
 bld.RECURSE('lib/tevent')
+bld.RECURSE('lib/texpect')
 bld.RECURSE('lib/addns')
-bld.RECURSE('lib/ccan')
-bld.RECURSE('lib/tdb_compat')
-if not bld.env.disable_ntdb:
-    bld.RECURSE('lib/ntdb')
 bld.RECURSE('lib/ldb')
 bld.RECURSE('lib/param')
 bld.RECURSE('dynconfig')
@@ -68,11 +66,17 @@ bld.RECURSE('source4/lib/registry')
 bld.RECURSE('source4/lib/messaging')
 bld.RECURSE('source4/lib/events')
 bld.RECURSE('source4/lib/cmdline')
-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/http')
+if bld.CONFIG_GET('NSS_WRAPPER'):
+    bld.RECURSE('lib/nss_wrapper')
+if bld.CONFIG_GET('SOCKET_WRAPPER'):
+    bld.RECURSE('lib/socket_wrapper')
+if bld.CONFIG_GET('RESOLV_WRAPPER'):
+    bld.RECURSE('lib/resolv_wrapper')
+if bld.CONFIG_GET('UID_WRAPPER'):
+    bld.RECURSE('lib/uid_wrapper')
+if bld.CHECK_FOR_THIRD_PARTY():
+    bld.RECURSE('third_party')
 bld.RECURSE('source4/lib/stream')
 bld.RECURSE('lib/afs')
 bld.RECURSE('lib/util')
@@ -81,7 +85,6 @@ bld.RECURSE('lib/tdr')
 bld.RECURSE('lib/tsocket')
 bld.RECURSE('lib/crypto')
 bld.RECURSE('lib/torture')
-bld.RECURSE('lib/zlib')
 bld.RECURSE('source4/lib/com')
 bld.RECURSE('source4/dns_server')
 bld.RECURSE('source4/echo_server')
@@ -104,7 +107,6 @@ bld.RECURSE('source4/libcli')
 bld.RECURSE('libcli/smb')
 bld.RECURSE('libcli/util')
 bld.RECURSE('libcli/cldap')
-bld.RECURSE('lib/subunit/c')
 bld.RECURSE('lib/smbconf')
 bld.RECURSE('lib/async_req')
 bld.RECURSE('lib/dbwrap')
@@ -134,9 +136,10 @@ else:
     bld.PROCESS_SEPARATE_RULE('system_mitkrb5')
 
 bld.RECURSE('libcli/smbreadline')
-bld.RECURSE('codepages')
 if bld.AD_DC_BUILD_IS_ENABLED():
     bld.RECURSE('source4/setup')
+if bld.env.with_ctdb:
+    bld.RECURSE('ctdb')
 bld.RECURSE('source4/scripting')
 bld.RECURSE('pidl')
 bld.RECURSE('lib')