wafsamba: flags from enviroment are put before our own internal versions

[obnox/samba/samba-obnox.git] / wscript_build

diff --git a/wscript_build b/wscript_build
index f28c08cb41429ab4313032ec679f0e25cfa10ed5..fc4197441f438894bbc35d443a8a9ee3a247955e 100644 (file)
--- a/wscript_build
+++ b/wscript_build
@@ -20,7 +20,7 @@ bld.env.build_public_headers = 'include/public'
 
 # these are includes which appear in public headers, but with #ifdef conditional
 # compilation, so they are safe
-bld.env.public_headers_skip = ['lib/param/param_proto.h']
+bld.env.public_headers_skip = ['lib/param/param_proto.h', 'lib/param/param_functions.h']
 
 samba_version.load_version(bld.env, is_install=bld.is_install)
 bld.SAMBA_MKVERSION('version.h')
@@ -38,6 +38,7 @@ 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')
@@ -68,19 +69,21 @@ bld.RECURSE('source4/lib/registry')
 bld.RECURSE('source4/lib/messaging')
 bld.RECURSE('source4/lib/events')
 bld.RECURSE('source4/lib/cmdline')
+bld.RECURSE('source4/lib/http')
 bld.RECURSE('lib/socket_wrapper')
+bld.RECURSE('lib/resolv_wrapper')
 bld.RECURSE('lib/nss_wrapper')
 bld.RECURSE('lib/uid_wrapper')
-bld.RECURSE('lib/popt')
-bld.RECURSE('lib/iniparser/src')
+if bld.CHECK_FOR_THIRD_PARTY():
+    bld.RECURSE('third_party')
 bld.RECURSE('source4/lib/stream')
+bld.RECURSE('lib/afs')
 bld.RECURSE('lib/util')
 bld.RECURSE('lib/tdb_wrap')
 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')
@@ -136,6 +139,8 @@ 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')