sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s3-build: Support building with in-tree CTDB

Browse Source 
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
This commit is contained in:
Amitay Isaacs 2014-05-14 01:11:43 +10:00 committed by Michael Adam
parent 6edbbce887
commit 9487785e89
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/wscript
View File

@ -1451,8 +1451,10 @@ main() {
includes = '' includes = ''
if Options.options.ctdb_dir: if Options.options.ctdb_dir:
CTDB_CFLAGS = '-I' + Options.options.ctdb_dir + '/include' CTDB_INCLUDE = Options.options.ctdb_dir + '/include'
includes = includes + ' ' + Options.options.ctdb_dir + '/include' else:
CTDB_INCLUDE = conf.srcdir + '/ctdb/include'
includes = includes + ' ' + CTDB_INCLUDE
if not conf.env.USING_SYSTEM_TDB: if not conf.env.USING_SYSTEM_TDB:
includes = includes + ' ' + srcdir + '/lib/tdb/include' includes = includes + ' ' + srcdir + '/lib/tdb/include'
@ -1716,6 +1718,7 @@ main() {
if have_cluster_support: if have_cluster_support:
Logs.info("building with cluster support") Logs.info("building with cluster support")
conf.env['CTDB_CFLAGS'] = CTDB_CFLAGS conf.env['CTDB_CFLAGS'] = CTDB_CFLAGS
conf.env['CTDB_INCLUDE'] = CTDB_INCLUDE
else: else:
if Options.options.with_cluster_support == False: if Options.options.with_cluster_support == False:
Logs.info("building without cluster support (--without-cluster-support)") Logs.info("building without cluster support (--without-cluster-support)")

3
source3/wscript_build
View File

@ -273,7 +273,7 @@ bld.SAMBA3_SUBSYSTEM('samba3util',
lib/sock_exec.c''', lib/sock_exec.c''',
deps='ndr samba-security NDR_SECURITY samba-util util_tdb ccan-hash') deps='ndr samba-security NDR_SECURITY samba-util util_tdb ccan-hash')
if bld.CONFIG_GET("CTDB_CFLAGS"): if bld.CONFIG_GET("CTDB_CFLAGS") and bld.CONFIG_GET("CTDB_INCLUDE"):
SAMBA_CLUSTER_SUPPORT_SOURCES=''' SAMBA_CLUSTER_SUPPORT_SOURCES='''
lib/cluster_support.c lib/cluster_support.c
lib/dbwrap/dbwrap_ctdb.c lib/dbwrap/dbwrap_ctdb.c
@ -302,6 +302,7 @@ bld.SAMBA3_LIBRARY('samba-cluster-support',
source=SAMBA_CLUSTER_SUPPORT_SOURCES, source=SAMBA_CLUSTER_SUPPORT_SOURCES,
deps=SAMBA_CLUSTER_SUPPORT_DEPS, deps=SAMBA_CLUSTER_SUPPORT_DEPS,
cflags=bld.CONFIG_GET("CTDB_CFLAGS"), cflags=bld.CONFIG_GET("CTDB_CFLAGS"),
includes=bld.CONFIG_GET("CTDB_INCLUDE"),
allow_undefined_symbols=True, allow_undefined_symbols=True,
private_library=True) private_library=True)