The branch, master has been updated via d5d0a45 build(waf): Fix the --with-cluster build from d2aa785 lib/tsocket: fix loop in tdgram_bsd_recvfrom() (bug #9184)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit d5d0a454cef8c732235b554df89761d4dcd854ba Author: Michael Adam <ob...@samba.org> Date: Tue Oct 23 15:53:17 2012 +0200 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 <ob...@samba.org> Signed-off-by: Volker Lendecke <v...@samba.org> Signed-off-by: Stefan Metzmacher <me...@samba.org> Autobuild-User(master): Michael Adam <ob...@samba.org> Autobuild-Date(master): Tue Oct 23 18:29:26 CEST 2012 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: source3/wscript | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/wscript b/source3/wscript index f049700..cc94053 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 = "" -- Samba Shared Repository