ldb/tevent: Fix detection of waf paths.

diff --git a/lib/tevent/Makefile b/lib/tevent/Makefile
index f6750fe65ca4697c3080bf4ecc96054af12e8052..3f188a955fdc2ee6a146218765c7ebbb8117411b 100644 (file)
--- a/lib/tevent/Makefile
+++ b/lib/tevent/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/lib/tevent/configure b/lib/tevent/configure
index 2d4aec724ef3f6f47c036f2f4689cbf676b72f58..15ad1a57f1656b492aeda3c36dd7c3ce1cd6ec80 100755 (executable)
--- a/lib/tevent/configure
+++ b/lib/tevent/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 "tevent: Unable to find waf"
+       exit 1
+fi
 
 # using JOBS=1 gives maximum compatibility with
 # systems like AIX which have broken threading in python

diff --git a/source4/lib/ldb/Makefile b/source4/lib/ldb/Makefile
index f97ed34e3f38cd9ac347f9a544bcb8d8b630cf81..3f188a955fdc2ee6a146218765c7ebbb8117411b 100644 (file)
--- 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 50ff475ccad2577a4ca8f039f73cfa6b0d8e6934..137a26bcbe0e6165e00f1c49b8f5bce07803b967 100755 (executable)
--- 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