diff options
author | Andrew Bartlett <abartlet@samba.org> | 2018-12-12 07:10:30 +1300 |
---|---|---|
committer | Noel Power <npower@samba.org> | 2018-12-14 14:40:19 +0100 |
commit | 5ddff307b4af5c82d5064745f5bd2c33bd340ced (patch) | |
tree | 3f1d81d3e862bfe5f47c2e66684f2115d06554cc /ctdb/configure | |
parent | 31957c7fe9d0f67bef08177e982043a23b172c7d (diff) | |
download | samba-5ddff307b4af5c82d5064745f5bd2c33bd340ced.tar.gz |
build: Move python detection back into waf (instead of in configure and Makefile)
This avoids creating a mini-configure in the configure script.
Users wishing to use python2 to build need to specify PYTHON=
to both ./configure and make
After we merged the python3 change, it became clear that relying on systems prefixing
the correct python just causes trouble and make debugging harder, so only use $PYTHON
for the override, not the default case
This essentially reverts a660b7fb8e519bd3be558fd0425bff8f287fca1f but
leaves the files more consistent.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Noel Power <npower@samba.org>
Diffstat (limited to 'ctdb/configure')
-rwxr-xr-x | ctdb/configure | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ctdb/configure b/ctdb/configure index 370ddccb6a5..dbb0c1446b5 100755 --- a/ctdb/configure +++ b/ctdb/configure @@ -11,5 +11,5 @@ JOBS=1 export JOBS cd . || exit 1 -${PYTHON:=python3} $WAF configure "$@" || exit 1 +$PYTHON $WAF configure "$@" || exit 1 cd $PREVPATH |