From 730e16fbf71e13a481322c909ae3f4118d11b6e6 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 30 Oct 2012 14:41:04 +0100 Subject: [PATCH 1/2] build(waf): fix a tab indentation to spaces Patch 1/2 for fixing bug #9353. Signed-off-by: Michael Adam --- source3/wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/wscript b/source3/wscript index 3e11715..954b99b 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1306,7 +1306,7 @@ main() { else: includes = '' - if not conf.env.USING_SYSTEM_TDB: + if not conf.env.USING_SYSTEM_TDB: includes = includes + ' ' + srcdir + '/lib/tdb/include' have_cluster_support = True -- 1.7.9.5 From b0a751dd68d5f266de29b2174de70cc0f19007ae Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 30 Oct 2012 14:43:42 +0100 Subject: [PATCH 2/2] build(waf): fix the cluster(ctdb) build without system talloc installed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. Patch 2/2 for fixing bug #9353. Signed-off-by: Michael Adam Tested-by: Björn Baumbach --- source3/wscript | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source3/wscript b/source3/wscript index 954b99b..2dd7425 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1309,6 +1309,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 = "" -- 1.7.9.5