Changeset: d9a1bee0ff29 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d9a1bee0ff29
Modified Files:
configure.ag
Branch: Mar2018
Log Message:
Properly fix bug 6598.
diffs (41 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1189,7 +1189,9 @@ AS_VAR_IF([have_python3], [no],
have_python3_libdir=no
PYTHON3_LIBDIR=""
# and no interpreter
- PYTHON3=false],
+ PYTHON3=false
+ # and no Python 3 integration
+ enable_py3integration=no],
[have_python3_libdir=auto
AC_ARG_WITH([python3-libdir],
@@ -1936,6 +1938,16 @@ AM_CONDITIONAL([HAVE_LIBPY], [test x"$ha
# Python 3 UDFs
have_libpy3=no
+AS_VAR_IF([enable_py3integration], [no], [],
+ [AS_CASE([`"$PYTHON3" -V 2>&1`],
+ ["Python 3."[[1234]]"."*],
+ [AS_VAR_IF([enable_py3integration], [auto],
+ [have_libpy3=no
+ why_not_libpy3="(Python >= 3.5 required)"
+ enable_py3integration=no
+ why_not_py3integration="(Python >= 3.5 required)"],
+ [AC_MSG_ERROR([Python >= 3.5 is required for Python3
integration support])])])])
+
if test "x$enable_py3integration" != xno; then
case "$enable_py3integration" in
yes|auto)
@@ -1968,9 +1980,6 @@ if test "x$enable_py3integration" != xno
PYTHON_CMD=$PYTHON3
- AS_CASE([`"$PYTHON_CMD" -V 2>&1`],
- ["Python 3."[[1234]]"."*], [AC_MSG_ERROR([Python >= 3.5 is
required for Python3 integration support])])
-
NUMPYVER=`$PYTHON_CMD -c "import numpy;
print(int(numpy.__version__.split('.').__getitem__(1)) >= 7)" 2> /dev/null`
# check numpyconfig.h because autoconf tests includes by compiling a
small C program, and other numpy headers do not compile without Python.h
AC_CHECK_HEADER(
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
