THRIFT-3439 Run make cross using Python3 when available
Client: Test
Patch: Nobuaki Sukegawa
Add Makefile.am change that was missing in the original patch.
This closes #792
diff --git a/configure.ac b/configure.ac
index 3a1314d..92dc58c 100755
--- a/configure.ac
+++ b/configure.ac
@@ -274,10 +274,11 @@
fi
AM_CONDITIONAL(WITH_LUA, [test "$have_lua" = "yes"])
+# Find python regardless of with_python value, because it's needed by make cross
+AM_PATH_PYTHON(2.6,, :)
AX_THRIFT_LIB(python, [Python], yes)
if test "$with_python" = "yes"; then
AC_PATH_PROG([TRIAL], [trial])
- AM_PATH_PYTHON(2.6,, :)
if test -n "$TRIAL" && test "x$PYTHON" != "x" && test "x$PYTHON" != "x:" ; then
have_python="yes"
fi
@@ -286,11 +287,9 @@
# Find "python3" executable.
# It's distro specific and far from ideal but needed to cross test py2-3 at once.
-if test "x$have_python" = "xyes"; then
- AC_PATH_PROG([PYTHON3], [python3])
- if test "x$PYTHON3" != "x" && test "x$PYTHON3" != "x:" ; then
- have_py3="yes"
- fi
+AC_PATH_PROG([PYTHON3], [python3])
+if test "x$PYTHON3" != "x" && test "x$PYTHON3" != "x:" ; then
+ have_py3="yes"
fi
AM_CONDITIONAL(WITH_PY3, [test "$have_py3" = "yes"])