diff options
| author | Michael Adam <obnox@samba.org> | 2014-10-24 17:53:08 +0200 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2014-10-28 05:42:05 +0100 |
| commit | bf98630f0a44597e61cdfc735ab73d862643007b (patch) | |
| tree | f69abcdebfcbb98f2bff39003c87fe4833aea4f6 | |
| parent | eeebbe73125967943d95b6e03cbf695d3d219bc0 (diff) | |
| download | samba-bf98630f0a44597e61cdfc735ab73d862643007b.tar.gz | |
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 <obnox@samba.org>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
| -rw-r--r-- | source3/wscript | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/source3/wscript b/source3/wscript index 191e96b7701..b8877a16f47 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) { }', |