From: Michael Adam <obnox@samba.org>
Date: Tue, 30 Oct 2012 13:43:42 +0000 (+0100)
Subject: build(waf): fix the cluster(ctdb) build without system talloc installed
X-Git-Tag: ldb-1.1.14~68
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=872f499c55ac13befb357d3e8eca0f526ea14978;p=thirdparty%2Fsamba.git

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>
---

diff --git a/source3/wscript b/source3/wscript
index 9db03ec6e39..5cbfd35f2a6 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 = ""