diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-08-25 14:05:48 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-10-08 09:42:08 +0200 |
| commit | e94422a8acf4a812ed19ddd63b42789df49a3f00 (patch) | |
| tree | dbe6bfd3c1f0f8922af6cb42b4d6a113f1d8cca5 | |
| parent | d568be69891da3944df2de8629e7e64bc480ad86 (diff) | |
| download | samba-e94422a8acf4a812ed19ddd63b42789df49a3f00.tar.gz | |
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
| -rw-r--r-- | wscript | 4 | ||||
| -rw-r--r-- | wscript_build | 2 |
2 files changed, 6 insertions, 0 deletions
@@ -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 48cb71db8d0..d7dea5466ea 100644 --- 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') |