diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-05-14 01:11:43 +1000 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-05-27 16:07:13 +0200 |
| commit | 9487785e89e9c6f920c6284a1bd1165bd7d80cc0 (patch) | |
| tree | 123e30a1a98ee598f088110764f1d93d76c36e24 /source3/wscript | |
| parent | 6edbbce887d4af28b026a43059cd339fb3674932 (diff) | |
| download | samba-9487785e89e9c6f920c6284a1bd1165bd7d80cc0.tar.gz samba-9487785e89e9c6f920c6284a1bd1165bd7d80cc0.tar.xz samba-9487785e89e9c6f920c6284a1bd1165bd7d80cc0.zip | |
s3-build: Support building with in-tree CTDB
If --with-ctdb-dir option is not specified, use CTDB headers from ctdb/
subdirectory in the source tree.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Tue May 27 16:07:13 CEST 2014 on sn-devel-104
Diffstat (limited to 'source3/wscript')
| -rw-r--r-- | source3/wscript | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source3/wscript b/source3/wscript index 7cc62cc3e58..3b38d19ae9d 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1451,8 +1451,10 @@ main() { includes = '' if Options.options.ctdb_dir: - CTDB_CFLAGS = '-I' + Options.options.ctdb_dir + '/include' - includes = includes + ' ' + Options.options.ctdb_dir + '/include' + CTDB_INCLUDE = Options.options.ctdb_dir + '/include' + else: + CTDB_INCLUDE = conf.srcdir + '/ctdb/include' + includes = includes + ' ' + CTDB_INCLUDE if not conf.env.USING_SYSTEM_TDB: includes = includes + ' ' + srcdir + '/lib/tdb/include' @@ -1716,6 +1718,7 @@ main() { if have_cluster_support: Logs.info("building with cluster support") conf.env['CTDB_CFLAGS'] = CTDB_CFLAGS + conf.env['CTDB_INCLUDE'] = CTDB_INCLUDE else: if Options.options.with_cluster_support == False: Logs.info("building without cluster support (--without-cluster-support)") |