Changeset: 8f6249f76969 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8f6249f76969
Modified Files:
configure.ag
Branch: pyapi
Log Message:
Added configure check to test if numpy is installed and if numpy version >=
1.7.0 (todo: see which version is actually required).
diffs (31 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2299,7 +2299,7 @@ if test "x$enable_pyintegration" != xno;
esac
AC_PATH_PROG(PYCMD,python-config,,$XPATH)
if test "x$PYCMD" = x; then
- if test "x$enable_pyintegration" = xyes; then
+ if test "x$enable_pyintegration" = xyes; then
AC_MSG_ERROR([python-config library required for Python
integration support])
else
have_libpy="no"
@@ -2307,6 +2307,18 @@ if test "x$enable_pyintegration" != xno;
enable_pyintegration=no
disable_pyintegration="(python-config command not
found)"
fi
+ fi
+ PYTHON_CMD=`$PYCMD --exec-prefix`/bin/python
+ NUMPYVER=`$PYTHON_CMD -c "import numpy; print
numpy.__version__.split('.').__getitem__(1) >= 7"`
+ if [test "x$NUMPYVER" = x] || [test "x$NUMPYVER" = xFalse]; then
+ if test "x$enable_pyintegration" = xyes; then
+ AC_MSG_ERROR([numpy version >= 1.7.0 required for
Python integration support])
+ else
+ have_libpy="no"
+ why_have_libpy="(numpy version >= 1.7.0 not found)"
+ enable_pyintegration=no
+ disable_pyintegration="(numpy version >= 1.7.0 not
found)"
+ fi
elif libpy_CFLAGS=`\`$PYCMD --exec-prefix\`/bin/python -c "from
distutils.sysconfig import get_python_inc; import numpy; print ' -I' +
get_python_inc() + ' -I' + numpy.get_include();"` && libpy_LIBS=`$PYCMD
--ldflags`; then
have_libpy=yes
AC_DEFINE(HAVE_LIBPY, 1, [Define if we can link to python])
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
