From d5d0a454cef8c732235b554df89761d4dcd854ba Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 23 Oct 2012 15:53:17 +0200 Subject: build(waf): Fix the --with-cluster build The problem with the cluster/ctdb configure checks in Samba currently is, that the headers need to include . If there are no system tdb headers, configure fails to find tdb headers at this stage. Since the include is only required for some defines (TDB_DATA), the workaround is to temporarily add the included tdb copy's include path to the include search path in the configure test. The ctdb we run against will most likely have been compiled against a different version of TDB anyways... To properly fix this, we might need to change ctdb to rely on an external tdb library. Or to incorporate ctdb into samba as a component that uses the same shipped tdb version. Signed-off-by: Michael Adam Signed-off-by: Volker Lendecke Signed-off-by: Stefan Metzmacher Autobuild-User(master): Michael Adam Autobuild-Date(master): Tue Oct 23 18:29:26 CEST 2012 on sn-devel-104 --- source3/wscript | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/wscript') diff --git a/source3/wscript b/source3/wscript index f049700b16..cc940537ea 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1302,6 +1302,9 @@ main() { else: includes = '' + if not conf.env.USING_SYSTEM_TDB: + includes = includes + ' ' + srcdir + '/lib/tdb/include' + have_cluster_support = True ctdb_broken = "" -- cgit