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 <tdb.h>.
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 <obnox@samba.org>
Signed-off-by: Volker Lendecke <vl@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Tue Oct 23 18:29:26 CEST 2012 on sn-devel-104

diff --git a/source3/wscript b/source3/wscript
index f049700b161e09deba6b82831ab450a65af7d189..cc940537ea692f8a81e01ca616da3b1250fc65e1 100644 (file)
--- 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 = ""