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>

diff --git a/source3/wscript b/source3/wscript
index 191e96b77018b01c0ea6da0a8f9ac7216ad3dc4c..b8877a16f479a9090aa69724338a9e8b7e9a3ef7 100644 (file)
--- 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) { }',