From 4749aec513e4409d4c6a0f0cb4e6121175a1c50d Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Sat, 7 Nov 2015 23:21:34 +1100 Subject: [PATCH] s3-build: Avoid setting CTDB specific include path The include paths for CTDB are set via ctdb/wscript. Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke Autobuild-User(master): Martin Schwenke Autobuild-Date(master): Mon Nov 9 14:31:24 CET 2015 on sn-devel-104 --- source3/wscript | 3 +-- source3/wscript_build | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/source3/wscript b/source3/wscript index 4b65d8852bc..2f2c1db8769 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1484,9 +1484,8 @@ main() { conf.env.with_ctdb = False else: Logs.info("building with cluster support") - conf.env['CTDB_CFLAGS'] = '-DCLUSTER_SUPPORT=1' - conf.env['CTDB_INCLUDE'] = conf.srcdir + '/ctdb/include' conf.env.with_ctdb = True + conf.DEFINE('CLUSTER_SUPPORT', 1) conf.CHECK_CODE('void seekdir(DIR *d, long loc) { return; }', 'SEEKDIR_RETURNS_VOID', diff --git a/source3/wscript_build b/source3/wscript_build index be749efbe37..e28fe303f0b 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -262,7 +262,7 @@ bld.SAMBA3_SUBSYSTEM('samba3util', lib/sock_exec.c''', deps='ndr LIBTSOCKET samba-security NDR_SECURITY samba-util util_tdb sys_rw iov_buf') -if bld.CONFIG_GET("CTDB_CFLAGS") and bld.CONFIG_GET("CTDB_INCLUDE"): +if bld.env.with_ctdb: SAMBA_CLUSTER_SUPPORT_SOURCES=''' lib/cluster_support.c lib/dbwrap/dbwrap_ctdb.c @@ -287,8 +287,6 @@ else: bld.SAMBA3_LIBRARY('samba-cluster-support', source=SAMBA_CLUSTER_SUPPORT_SOURCES, deps=SAMBA_CLUSTER_SUPPORT_DEPS, - cflags=bld.CONFIG_GET("CTDB_CFLAGS"), - includes=bld.CONFIG_GET("CTDB_INCLUDE"), allow_undefined_symbols=True, private_library=True) -- 2.34.1