X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=wscript_build;h=f0c9f2a5b3d1ea544f04e8de1751936af09b63c1;hb=6960f8e4c3d683103580aa91605f951bc227dbed;hp=ab6f9be40cbdd61b205ed1b31c9d740f8f920fff;hpb=8db121be4265bc4de3b34c6eab1b5ae2fd882957;p=obnox%2Fsamba%2Fsamba-obnox.git

diff --git a/wscript_build b/wscript_build
index ab6f9be40cb..f0c9f2a5b3d 100644
--- 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,11 +34,13 @@ 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')
 bld.RECURSE('lib/util/charset')
-bld.RECURSE('source4/scripting/python')
+bld.RECURSE('python')
 bld.RECURSE('source4/param')
 bld.RECURSE('source4/librpc')
 bld.RECURSE('source4/dsdb')
@@ -48,7 +51,6 @@ bld.RECURSE('source4/libnet')
 bld.RECURSE('source4/auth')
 bld.RECURSE('auth')
 bld.RECURSE('auth/kerberos')
-bld.RECURSE('lib/iniparser/src')
 bld.RECURSE('nsswitch')
 bld.RECURSE('nsswitch/libwbclient')
 bld.RECURSE('source4/lib/samba3')
@@ -63,14 +65,15 @@ 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/stream')
 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')
 bld.RECURSE('source4/lib/com')
 bld.RECURSE('source4/dns_server')
 bld.RECURSE('source4/echo_server')
@@ -94,9 +97,9 @@ bld.RECURSE('libcli/smb')
 bld.RECURSE('libcli/util')
 bld.RECURSE('libcli/cldap')
 bld.RECURSE('lib/subunit/c')
-bld.RECURSE('source4/kdc')
 bld.RECURSE('lib/smbconf')
 bld.RECURSE('lib/async_req')
+bld.RECURSE('lib/dbwrap')
 bld.RECURSE('libcli/security')
 bld.RECURSE('libcli/ldap')
 bld.RECURSE('libcli/nbt')
@@ -105,14 +108,27 @@ 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_GET('KRB5_VENDOR') in (None, 'heimdal'):
+    if bld.CONFIG_GET("HEIMDAL_KRB5_CONFIG") and bld.CONFIG_GET("USING_SYSTEM_KRB5"):
+        # 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('embedded_heimdal')
+else:
+    bld.PROCESS_SEPARATE_RULE('system_mitkrb5')
+
 bld.RECURSE('libcli/smbreadline')
 bld.RECURSE('codepages')
-bld.RECURSE('source4/setup')
+if bld.AD_DC_BUILD_IS_ENABLED():
+    bld.RECURSE('source4/setup')
 bld.RECURSE('source4/scripting')
 bld.RECURSE('pidl')
 bld.RECURSE('lib')
@@ -120,9 +136,16 @@ bld.RECURSE('libds/common')
 bld.RECURSE('source3')
 bld.RECURSE('dfs_server')
 bld.RECURSE('file_server')
+bld.RECURSE('lib/krb5_wrap')
 
 bld.RECURSE('testsuite/headers')
-bld.RECURSE('testsuite/libsmbclient/src')
 
 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')