Commit ee4d43cf authored by Tiago Peixoto's avatar Tiago Peixoto

Improve automatic detection of scipy/numpy include paths

parent cb0e04d1
...@@ -213,9 +213,10 @@ dnl Checks for header files. ...@@ -213,9 +213,10 @@ dnl Checks for header files.
dnl numpy dnl numpy
AC_PYTHON_MODULE(numpy, fatal) AC_PYTHON_MODULE(numpy, fatal)
[NUMPY_DIR="${PYTHON_SITE_PKG}/numpy"] dnl [NUMPY_DIR="${PYTHON_SITE_PKG}/numpy"]
[NUMPY_DIR=`$PYTHON -c "import os, numpy; print os.path.dirname(numpy.__file__)"`]
AC_ARG_WITH([numpy], [AS_HELP_STRING([--with-numpy=DIR],[directory where numpy is installed AC_ARG_WITH([numpy], [AS_HELP_STRING([--with-numpy=DIR],[directory where numpy is installed
[default=${PYTHON_SITE_PKG}/numpy] ])], [default="autodetected"] ])],
NUMPY_DIR=$withval) NUMPY_DIR=$withval)
[NUMPY_DIR="${NUMPY_DIR}/core/include/numpy"] [NUMPY_DIR="${NUMPY_DIR}/core/include/numpy"]
AC_CHECK_HEADER([${NUMPY_DIR}/arrayobject.h], AC_CHECK_HEADER([${NUMPY_DIR}/arrayobject.h],
...@@ -225,7 +226,8 @@ AC_CHECK_HEADER([${NUMPY_DIR}/arrayobject.h], ...@@ -225,7 +226,8 @@ AC_CHECK_HEADER([${NUMPY_DIR}/arrayobject.h],
dnl scipy dnl scipy
AC_PYTHON_MODULE(scipy, fatal) AC_PYTHON_MODULE(scipy, fatal)
[SCIPY_DIR="${PYTHON_SITE_PKG}/scipy"] dnl [SCIPY_DIR="${PYTHON_SITE_PKG}/scipy"]
[SCIPY_DIR=`$PYTHON -c "import os, scipy; print os.path.dirname(scipy.__file__)"`]
AC_ARG_WITH([scipy], [AS_HELP_STRING([--with-scipy=DIR],[scipy install directory AC_ARG_WITH([scipy], [AS_HELP_STRING([--with-scipy=DIR],[scipy install directory
[default=${PYTHON_SITE_PKG}/scipy] ])], [default=${PYTHON_SITE_PKG}/scipy] ])],
[SCIPY_DIR=$withval]) [SCIPY_DIR=$withval])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment