build: Hook CTDB into top level build using --with-cluster-support

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Oct  8 09:42:08 CEST 2014 on sn-devel-104

diff --git a/wscript b/wscript
index 73c113cc0946bd07235fdb8218cb9abaa8d1c805..7124e576d238ec5f254994e4fb845f9ca805b487 100644 (file)
--- a/wscript
+++ b/wscript
@@ -43,6 +43,7 @@ def set_options(opt):
     opt.RECURSE('pidl')
     opt.RECURSE('source3')
     opt.RECURSE('lib/util')
+    opt.RECURSE('ctdb')
 
     opt.add_option('--with-system-mitkrb5',
                    help='enable system MIT krb5 build (includes Samba 4 client and Samba 3 code base).'+
@@ -166,6 +167,9 @@ def configure(conf):
     conf.RECURSE('selftest')
     conf.RECURSE('source3')
     conf.RECURSE('lib/texpect')
+    if Options.options.with_cluster_support:
+        conf.env.with_ctdb = True
+        conf.RECURSE('ctdb')
 
     conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
 

diff --git a/wscript_build b/wscript_build
index 48cb71db8d07cd6d6a109afd9fc32dede44cb3db..d7dea5466eada2c977da1ab43bbf4bd8cde23911 100644 (file)
--- a/wscript_build
+++ b/wscript_build
@@ -139,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')