s3:libsmb: get rid of cli_state_*_sockaddr

[mat/samba.git] / wscript

diff --git a/wscript b/wscript
index 5901f5af57520930cf7fa68289a83c26aca72a20..56dee2ea0c25af65e4426b2f5e10979c21da0d9d 100755 (executable)
--- a/wscript
+++ b/wscript
@@ -30,6 +30,15 @@ def set_options(opt):
     opt.RECURSE('lib/uid_wrapper')
     opt.RECURSE('pidl')
     opt.RECURSE('source3')
+    opt.RECURSE('lib/util')
+
+    opt.add_option('--with-system-mitkrb5',
+                   help='enable system MIT krb5 build (includes Samba 4 client and Samba 3 code base)',
+                   action='store_true', dest='with_system_mitkrb5', default=False)
+
+    opt.add_option('--without-ad-dc',
+                   help='disable AD DC functionality (enables Samba 4 client and Samba 3 code base). Requires system MIT krb5',
+                   action='store_true', dest='with_system_mitkrb5', default=False)
 
     gr = opt.option_group('developer options')
     gr.add_option('--enable-build-farm',
@@ -83,7 +92,18 @@ def configure(conf):
 
     conf.RECURSE('dynconfig')
     conf.RECURSE('lib/ldb')
-    conf.RECURSE('source4/heimdal_build')
+
+    if Options.options.with_system_mitkrb5:
+        conf.PROCESS_SEPARATE_RULE('system_mitkrb5')
+    else:
+        conf.DEFINE('AD_DC_BUILD_IS_ENABLED', 1)
+    # Only process heimdal_build for non-MIT KRB5 builds
+    # When MIT KRB5 checks are done as above, conf.env.KRB5_VENDOR will be set
+    # to the lowcased output of 'krb5-config --vendor'.
+    # If it is not set or the output is 'heimdal', we are dealing with
+    # system-provided or embedded Heimdal build
+    if conf.CONFIG_GET('KRB5_VENDOR') in (None, 'heimdal'):
+        conf.RECURSE('source4/heimdal_build')
     conf.RECURSE('source4/lib/tls')
     conf.RECURSE('source4/ntvfs/sysdep')
     conf.RECURSE('lib/util')
@@ -96,6 +116,7 @@ def configure(conf):
     conf.RECURSE('lib/socket_wrapper')
     conf.RECURSE('lib/uid_wrapper')
     conf.RECURSE('lib/popt')
+    conf.RECURSE('lib/iniparser/src')
     conf.RECURSE('lib/subunit/c')
     conf.RECURSE('libcli/smbreadline')
     conf.RECURSE('lib/crypto')
@@ -121,6 +142,13 @@ def configure(conf):
     del(conf.env.defines['PYTHONDIR'])
     del(conf.env.defines['PYTHONARCHDIR'])
 
+    if not conf.CHECK_CODE('#include "tests/summary.c"',
+                           define='SUMMARY_PASSES',
+                           addmain=False,
+                           execute=True,
+                           msg='Checking configure summary'):
+        raise Utils.WafError('configure summary failed')
+    
     conf.SAMBA_CONFIG_H('include/config.h')
 
 
@@ -150,7 +178,16 @@ def build(bld):
 
 def pydoctor(ctx):
     '''build python apidocs'''
-    cmd='PYTHONPATH=bin/python pydoctor --project-name=Samba --project-url=http://www.samba.org --make-html --docformat=restructuredtext --add-package bin/python/samba'
+    bp = os.path.abspath('bin/python')
+    mpaths = {}
+    for m in ['talloc', 'tdb', 'ldb']:
+        f = os.popen("PYTHONPATH=%s python -c 'import %s; print %s.__file__'" % (bp, m, m), 'r')
+        try:
+            mpaths[m] = f.read().strip()
+        finally:
+            f.close()
+    cmd='PYTHONPATH=%s pydoctor --introspect-c-modules --project-name=Samba --project-url=http://www.samba.org --make-html --docformat=restructuredtext --add-package bin/python/samba --add-module %s --add-module %s --add-module %s' % (
+        bp, mpaths['tdb'], mpaths['ldb'], mpaths['talloc'])
     print("Running: %s" % cmd)
     os.system(cmd)