s3: Make "do_connect" return NTSTATUS

[garming/samba-autobuild/.git] / wscript_build

diff --git a/wscript_build b/wscript_build
index 74f5dc3018aa8de04801e80925b252311a98e0c5..aa37c4bbc703e5330995ef884b6116308b95d301 100644 (file)
--- a/wscript_build
+++ b/wscript_build
@@ -27,17 +27,19 @@ bld.env.public_headers_skip = ['param/param_proto.h', 'lib/ldb_compat.h']
 # force headers to use SAMBA4 rules
 bld.env.public_headers_replace = { '#if _SAMBA_BUILD_ == 4' : '#if 1 /* _SAMBA_BUILD_ == 4 */' }
 
-samba_version.load_version(bld.env)
+samba_version.load_version(bld.env, is_install=bld.is_install)
 bld.SAMBA_MKVERSION('version.h')
 
 # bld.ENABLE_MAGIC_ORDERING()
 
 bld.RECURSE('lib/replace')
+bld.RECURSE('lib/socket')
 bld.RECURSE('lib/talloc')
-bld.RECURSE('lib/tdb')
 bld.RECURSE('lib/tevent')
+bld.RECURSE('lib/ccan')
+bld.RECURSE('lib/tdb_compat')
 bld.RECURSE('source4/lib/ldb')
-bld.RECURSE('source4/dynconfig')
+bld.RECURSE('dynconfig')
 bld.RECURSE('lib/util/charset')
 bld.RECURSE('source4/scripting/python')
 bld.RECURSE('source4/param')
@@ -119,12 +121,11 @@ bld.RECURSE('source4/scripting')
 bld.RECURSE('pidl')
 bld.RECURSE('lib')
 bld.RECURSE('libds/common')
-if bld.env.enable_s3build:
-    bld.RECURSE('source3')
+bld.RECURSE('source3')
 
 bld.RECURSE('testsuite/headers')
 
 # install some extra empty directories
-bld.INSTALL_DIRS("", "${LOCKDIR} ${SYSCONFDIR} ${LOCKDIR} ${PIDDIR} ${LOCALSTATEDIR}/lib ${PRIVATEDIR}/smbd.tmp/messaging")
+bld.INSTALL_DIRS("", "${LOCKDIR} ${STATEDIR} ${CACHEDIR} ${SWATDIR} ${SYSCONFDIR} ${PIDDIR} ${LOCALSTATEDIR}/lib ${PRIVATEDIR}/smbd.tmp/messaging ${CODEPAGEDIR} ${LOGFILEBASE} ${SETUPDIR}")
 
 bld.SYMBOL_CHECK()