From 63928c82c1c5ed2fa3bab30976566a8a393ef8b4 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 28 Sep 2010 09:00:26 +0200
Subject: ldb/tevent: Fix detection of waf paths.

---
 source4/lib/ldb/Makefile  | 4 +++-
 source4/lib/ldb/configure | 9 ++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'source4')

diff --git a/source4/lib/ldb/Makefile b/source4/lib/ldb/Makefile
index f97ed34e3f..3f188a955f 100644
--- a/source4/lib/ldb/Makefile
+++ b/source4/lib/ldb/Makefile
@@ -1,6 +1,8 @@
 # simple makefile wrapper to run waf
 
-WAF=WAF_MAKE=1 ../../../buildtools/bin/waf
+WAFPATH:=$(shell PATH=../../buildtools/bin:buildtools/bin:$(PATH) which waf)
+
+WAF=WAF_MAKE=1 $(WAFPATH)
 
 all:
 	$(WAF) build
diff --git a/source4/lib/ldb/configure b/source4/lib/ldb/configure
index 50ff475cca..137a26bcbe 100755
--- a/source4/lib/ldb/configure
+++ b/source4/lib/ldb/configure
@@ -2,7 +2,14 @@
 
 PREVPATH=`dirname $0`
 
-WAF=../../../buildtools/bin/waf
+if [ -f $PREVPATH/../../../buildtools/bin/waf ]; then
+	WAF=../../../buildtools/bin/waf
+elif [ -f $PREVPATH/buildtools/bin/waf ]; then
+	WAF=./buildtools/bin/waf
+else
+	echo "ldb: Unable to find waf"
+	exit 1
+fi
 
 # using JOBS=1 gives maximum compatibility with
 # systems like AIX which have broken threading in python
-- 
cgit