diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-09-28 09:00:26 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-09-28 09:12:41 +0200 |
| commit | 63928c82c1c5ed2fa3bab30976566a8a393ef8b4 (patch) | |
| tree | 8054490d74dafbf4ca3dc3257dc8f89cefdce70e | |
| parent | 4752d88fed66ac07e6704688cc2188e42d216962 (diff) | |
| download | samba-63928c82c1c5ed2fa3bab30976566a8a393ef8b4.tar.gz samba-63928c82c1c5ed2fa3bab30976566a8a393ef8b4.tar.bz2 samba-63928c82c1c5ed2fa3bab30976566a8a393ef8b4.zip | |
ldb/tevent: Fix detection of waf paths.
| -rw-r--r-- | lib/tevent/Makefile | 4 | ||||
| -rwxr-xr-x | lib/tevent/configure | 9 | ||||
| -rw-r--r-- | source4/lib/ldb/Makefile | 4 | ||||
| -rwxr-xr-x | source4/lib/ldb/configure | 9 |
4 files changed, 22 insertions, 4 deletions
diff --git a/lib/tevent/Makefile b/lib/tevent/Makefile index f6750fe65c..3f188a955f 100644 --- 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 2d4aec724e..15ad1a57f1 100755 --- 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 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 |