diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-10-10 14:29:51 +1100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-11-07 20:58:12 +0100 |
| commit | f0c685391fc683c7ec63246b167b59f2be84899e (patch) | |
| tree | cac251181d22fe7423e15e50b660b8ad92386dbe /source3/wscript | |
| parent | 0f19c13ca33c1dcd7ed77271cb6c9746fd919199 (diff) | |
| download | samba-f0c685391fc683c7ec63246b167b59f2be84899e.tar.gz | |
build: Simplify check for building with ctdb
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 69c0c43d55c93b82b2e398d5c61009fd347170bf)
Diffstat (limited to 'source3/wscript')
| -rw-r--r-- | source3/wscript | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/source3/wscript b/source3/wscript index 880ef238367..2745d5df1d6 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1443,19 +1443,14 @@ main() { conf.DEFINE('WITH_QUOTAS', '1') # - # checking for clustering extensions (CTDB) + # checking for clustering (CTDB) # - if Options.options.with_cluster_support == False: + if not Options.options.with_cluster_support: # configure is called with --without-cluster-support, # so don't check for and build w/o ctdb support. - have_cluster_support = False - + Logs.info("building without cluster support (--without-cluster-support)") + conf.env.with_ctdb = False else: - - have_cluster_support = True - ctdb_broken = "" - CTDB_CFLAGS = "" - srcdir = os.path.realpath(conf.srcdir) if 'EXTRA_INCLUDES' in conf.env: includes = ' '.join(conf.env['EXTRA_INCLUDES']).replace('#', srcdir + '/') @@ -1471,20 +1466,10 @@ main() { if not conf.env.USING_SYSTEM_TALLOC: includes = includes + ' ' + srcdir + '/lib/talloc' - if have_cluster_support: Logs.info("building with cluster support") conf.env['CTDB_CFLAGS'] = '-DCLUSTER_SUPPORT=1' conf.env['CTDB_INCLUDE'] = CTDB_INCLUDE - else: - if Options.options.with_cluster_support == False: - Logs.info("building without cluster support (--without-cluster-support)") - elif Options.options.with_cluster_support == True: - Logs.error("Cluster support not available: " + ctdb_broken) - conf.fatal("Cluster support not found, but --with-cluster-support was specified") - else: - Logs.info("building without cluster support: " + ctdb_broken) - conf.env['CTDB_CFLAGS'] = '' - + conf.env.with_ctdb = True conf.CHECK_CODE('__attribute__((destructor)) static void cleanup(void) { }', 'HAVE_FUNCTION_ATTRIBUTE_DESTRUCTOR', |