Change API for create_share_access_mask() - remove conn struct.

[kai/samba.git] / wscript_build

diff --git a/wscript_build b/wscript_build
old mode 100755 (executable)
new mode 100644 (file)
index f136ac1..ec673ce
--- a/wscript_build
+++ b/wscript_build
@@ -8,6 +8,7 @@ srcdir = "."
 import samba_version
 
 bld.env.suffix3 = "3"
+bld.env.suffix4 = "4"
 
 # create separate build groups for building the asn1 and et compiler, then
 # building the C from ASN1 and IDL, and finally the main build process
@@ -19,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 = ['param/param_proto.h']
+bld.env.public_headers_skip = ['lib/param/param_proto.h']
 
 samba_version.load_version(bld.env, is_install=bld.is_install)
 bld.SAMBA_MKVERSION('version.h')
@@ -33,6 +34,8 @@ bld.RECURSE('lib/tevent')
 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')
@@ -133,10 +136,16 @@ bld.RECURSE('libds/common')
 bld.RECURSE('source3')
 bld.RECURSE('dfs_server')
 bld.RECURSE('file_server')
-bld.RECURSE('utils')
 bld.RECURSE('lib/krb5_wrap')
 
 bld.RECURSE('testsuite/headers')
 
 bld.SYMBOL_CHECK()
 bld.DUP_SYMBOL_CHECK()
+
+bld.env.ABS_TOP_SRCDIR = bld.srcnode.abspath() + '/docs-xml'
+bld.env.ABS_TOP_BUILDDIR = bld.srcnode.abspath() + '/bin/default/docs-xml'
+bld.CONFIGURE_FILE('docs-xml/build/catalog.xml',
+                   ABS_TOP_BUILDDIR = bld.env.ABS_TOP_BUILDDIR,
+                   ABS_TOP_SRCDIR=bld.env.ABS_TOP_SRCDIR)
+bld.RECURSE('docs-xml')