diff options
| author | Michael Adam <obnox@samba.org> | 2014-10-24 17:53:08 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-11-07 20:58:12 +0100 |
| commit | 9c6e0fd67af3c486ba0c5e0999f4b28d9c1ba897 (patch) | |
| tree | 1c5d78caeb2ba9551b8ad0e7f87fbe894cb947c6 /source3/wscript | |
| parent | 80a51bbe66b1c50d737f9db1ce5fef45b6365959 (diff) | |
| download | samba-9c6e0fd67af3c486ba0c5e0999f4b28d9c1ba897.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>
(cherry picked from commit bf98630f0a44597e61cdfc735ab73d862643007b)
Diffstat (limited to 'source3/wscript')
| -rw-r--r-- | source3/wscript | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/source3/wscript b/source3/wscript index 2745d5df1d6..a89957ece62 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1451,24 +1451,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) { }', |