[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  ec0104b Makefile: Allow specifying PYTHON environment variable.
       via  010fd29 configure: Support specifying PYTHON environment variable to run waf.
      from  702049e torture: Fix smb2.create.blob test.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ec0104b1e0eea73331c58d26ea96b5167c2847ed
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Nov 6 22:29:07 2012 +0100

    Makefile: Allow specifying PYTHON environment variable.
    
    This is required for Minix, where python is named "python2.X".
    
    Reviewed-by: Simo Sorce <idra at samba.org>
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    
    Autobuild-User(master): Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date(master): Fri Nov  9 16:39:09 CET 2012 on sn-devel-104

commit 010fd296881aa643a4b631d57df503c9e832b35c
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Nov 6 22:24:07 2012 +0100

    configure: Support specifying PYTHON environment variable to run waf.
    
    This is necessary to run configure on Minix, where python is named
    "python2.X".
    
    Reviewed-by: Simo Sorce <idra at samba.org>
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 Makefile  |    3 ++-
 configure |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/Makefile b/Makefile
index ae2fc06..5f220fa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 # simple makefile wrapper to run waf
 
-WAF_BINARY=./buildtools/bin/waf
+PYTHON?=python
+WAF_BINARY=$(PYTHON) ./buildtools/bin/waf
 WAF=WAF_MAKE=1 $(WAF_BINARY)
 
 all:
diff --git a/configure b/configure
index 72f758e..30858df 100755
--- a/configure
+++ b/configure
@@ -10,5 +10,5 @@ JOBS=1
 export JOBS
 
 cd . || exit 1
-$WAF configure "$@" || exit 1
+${PYTHON:=python} $WAF configure "$@" || exit 1
 cd $PREVPATH


-- 
Samba Shared Repository