summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2012-10-30 14:43:42 +0100
committerVolker Lendecke <vl@samba.org>2012-11-02 13:47:34 +0100
commit872f499c55ac13befb357d3e8eca0f526ea14978 (patch)
treef3d9324fceace189e6e36ae352b3fc01834e518b
parentf8e71d4b602e5e1cca9f8701df93328718d8a6eb (diff)
downloadsamba-872f499c55ac13befb357d3e8eca0f526ea14978.tar.gz
samba-872f499c55ac13befb357d3e8eca0f526ea14978.tar.xz
samba-872f499c55ac13befb357d3e8eca0f526ea14978.zip
build(waf): fix the cluster(ctdb) build without system talloc installed
This is analogous to the earlier patch for tdb. It temporarily adds the talloc include path to the includes search list for the ctdb-header configure checks. Signed-off-by: Michael Adam <obnox@samba.org> Tested-by: Björn Baumbach <bb@sernet.de>
-rw-r--r--source3/wscript3
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/wscript b/source3/wscript
index 9db03ec6e3..5cbfd35f2a 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1305,6 +1305,9 @@ main() {
if not conf.env.USING_SYSTEM_TDB:
includes = includes + ' ' + srcdir + '/lib/tdb/include'
+ if not conf.env.USING_SYSTEM_TALLOC:
+ includes = includes + ' ' + srcdir + '/lib/talloc'
+
have_cluster_support = True
ctdb_broken = ""