diff options
| author | Stefan Metzmacher <metze@samba.org> | 2013-10-08 12:11:49 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-03-24 17:09:10 +0100 |
| commit | 6c007951bb5ada8cc3a2eabdc40568fa84da2831 (patch) | |
| tree | 3202b19495020876793c6956c0a0da9b42c1568b /source3/wscript | |
| parent | 1c96c068ad3869ca8411efbc07f82ae987ed2219 (diff) | |
| download | samba-6c007951bb5ada8cc3a2eabdc40568fa84da2831.tar.gz samba-6c007951bb5ada8cc3a2eabdc40568fa84da2831.tar.xz samba-6c007951bb5ada8cc3a2eabdc40568fa84da2831.zip | |
s3:wscript: don't add ctdb include dir globally
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3/wscript')
| -rw-r--r-- | source3/wscript | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/source3/wscript b/source3/wscript index 17cc17b835d..c1fadef79f7 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1438,8 +1438,9 @@ main() { else: - if Options.options.ctdb_dir: - conf.ADD_EXTRA_INCLUDES(Options.options.ctdb_dir + '/include') + have_cluster_support = True + ctdb_broken = "" + CTDB_CFLAGS = "" srcdir = os.path.realpath(conf.srcdir) if 'EXTRA_INCLUDES' in conf.env: @@ -1447,15 +1448,16 @@ main() { else: includes = '' + if Options.options.ctdb_dir: + CTDB_CFLAGS = '-I' + Options.options.ctdb_dir + '/include' + includes = includes + ' ' + Options.options.ctdb_dir + '/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' - have_cluster_support = True - ctdb_broken = "" - conf.CHECK_CODE(''' #define NO_CONFIG_H #include "replace.h" @@ -1691,6 +1693,7 @@ main() { if have_cluster_support: Logs.info("building with cluster support") conf.DEFINE('CLUSTER_SUPPORT', 1); + conf.env['CTDB_CFLAGS'] = CTDB_CFLAGS else: if Options.options.with_cluster_support == False: Logs.info("building without cluster support (--without-cluster-support)") @@ -1699,6 +1702,7 @@ main() { 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.undefine('CLUSTER_SUPPORT') |