This is an automated email from the ASF dual-hosted git repository.
jking pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
The following commit(s) were added to refs/heads/master by this push:
new 5751621 THRIFT-4301: fix inability to disable py3 with autoconf build
5751621 is described below
commit 57516213cc3b17a38196b07282feb47144e5232f
Author: James E. King III <[email protected]>
AuthorDate: Wed Jan 2 08:28:47 2019 -0500
THRIFT-4301: fix inability to disable py3 with autoconf build
---
configure.ac | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4a5fb39..fa50756 100755
--- a/configure.ac
+++ b/configure.ac
@@ -325,10 +325,13 @@ AM_CONDITIONAL(WITH_TWISTED_TEST, [test "$have_trial" =
"yes"])
# It's distro specific and far from ideal but needed to cross test py2-3 at
once.
# TODO: find "python2" if it's 3.x
have_py3="no"
-if python --version 2>&1 | grep -q "Python 2"; then
- AC_PATH_PROGS([PYTHON3], [python3 python3.5 python35 python3.4 python34])
- if test -n "$PYTHON3"; then
- have_py3="yes"
+AX_THRIFT_LIB(py3, [Py3], yes)
+if test "$with_py3" = "yes"; then
+ if $PYTHON --version 2>&1 | grep -q "Python 2"; then
+ AC_PATH_PROGS([PYTHON3], [python3 python3.7 python37 python3.6 python36
python3.5 python35 python3.4 python34])
+ if test -n "$PYTHON3"; then
+ have_py3="yes"
+ fi
fi
fi
AM_CONDITIONAL(WITH_PY3, [test "$have_py3" = "yes"])
