Merge r1834494 from trunk:

* build/buildcheck.sh, buildconf: Detect and run under Python 3 or 2,
  and respect $PYTHON.

* build/gen-build.py: Fix various Python 3 compatibility issues.



git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1834495 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 1 deletions

diff --git a/buildconf b/buildconf
index b70fa53ec..fa52bd11b 100755
--- a/buildconf
+++ b/buildconf
@@ -112,8 +112,10 @@ ${AUTOCONF:-autoconf} $verbose
 # Remove autoconf 2.5x's cache directory
 rm -rf autom4te*.cache
 
+PYTHON=${PYTHON-`build/PrintPath python3 python2 python`}
+
 echo "buildconf: generating 'make' outputs ..."
-build/gen-build.py $verbose make
+${PYTHON} build/gen-build.py $verbose make
 
 # Create RPM Spec file
 if [ -f `which cut` ]; then