From c5752f364723a5e369dc15fce00a88660f99b549 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 24 Oct 2014 17:53:08 +0200 Subject: [PATCH 1/2] build: further simplify --with-cluster-support case in configure includes were only built for the ctdb checks and they are now gone because we are building against included ctdb. Signed-off-by: Michael Adam --- source3/wscript | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/source3/wscript b/source3/wscript index 191e96b..b8877a1 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1468,24 +1468,9 @@ main() { Logs.info("building without cluster support (--without-cluster-support)") conf.env.with_ctdb = False else: - srcdir = os.path.realpath(conf.srcdir) - if 'EXTRA_INCLUDES' in conf.env: - includes = ' '.join(conf.env['EXTRA_INCLUDES']).replace('#', srcdir + '/') - else: - includes = '' - - CTDB_INCLUDE = conf.srcdir + '/ctdb/include' - includes = includes + ' ' + CTDB_INCLUDE - - if not conf.env.USING_SYSTEM_TDB: - includes = includes + ' ' + srcdir + '/lib/tdb/include' - - if not conf.env.USING_SYSTEM_TALLOC: - includes = includes + ' ' + srcdir + '/lib/talloc' - Logs.info("building with cluster support") conf.env['CTDB_CFLAGS'] = '-DCLUSTER_SUPPORT=1' - conf.env['CTDB_INCLUDE'] = CTDB_INCLUDE + conf.env['CTDB_INCLUDE'] = conf.srcdir + '/ctdb/include' conf.env.with_ctdb = True conf.CHECK_CODE('__attribute__((destructor)) static void cleanup(void) { }', -- 1.9.1