Merge branch 'master' into parvec

1 files changed, 20 insertions, 7 deletions

diff --git a/build/linux/configure.ac b/build/linux/configure.ac
index 58a3f4c..630b08d 100644
--- a/build/linux/configure.ac
+++ b/build/linux/configure.ac
@@ -24,12 +24,13 @@ dnl
 dnl -----------------------------------------------------------------------
 dnl $Id$
 
-AC_INIT(astra_toolbox, 1.5.0)
+AC_INIT(astra_toolbox, 1.7.1)
 AC_CONFIG_SRCDIR([Makefile.in])
 LT_INIT([disable-static])
 
 SAVED_CPPFLAGS="$CPPFLAGS"
 SAVED_CXXFLAGS="$CXXFLAGS"
+SAVED_NVCCFLAGS="$NVCCFLAGS"
 SAVED_LDFLAGS="$LDFLAGS"
 SAVED_LIBS="$LIBS"
 
@@ -73,7 +74,6 @@ AC_SUBST(HAVEBOOSTUTF)
 AC_SUBST(LIBS_BOOSTUTF)
 
 BOOSTok=yes
-AC_CHECK_HEADER([boost/lexical_cast.hpp],[],[BOOSTok=no],[])
 AC_CHECK_HEADER([boost/any.hpp],[],[BOOSTok=no],[])
 dnl AC_CHECK_HEADER([boost/thread.hpp],[],[BOOSTok=no],[])
 dnl AC_CHECK_HEADER([boost/bind.hpp],[],[BOOSTok=no],[])
@@ -124,10 +124,9 @@ if test x"$NVCC" != xno; then
   AC_SUBST(NVCC)
 fi
 
-NVCCFLAGS=""
 if test x"$HAVECUDA" = xyes; then
   AC_MSG_CHECKING([if nvcc works])
-  ASTRA_CHECK_NVCC(HAVECUDA,NVCCFLAGS)
+  ASTRA_CHECK_NVCC(HAVECUDA,NVCCFLAGS_EXTRA)
   AC_MSG_RESULT($HAVECUDA)
 fi
 
@@ -138,7 +137,7 @@ if test x"$HAVECUDA" = xyes; then
   if test x"$with_cuda_compute" = x; then
     with_cuda_compute="10,12,20,30,35,50"
   fi
-  ASTRA_FIND_NVCC_ARCHS([$with_cuda_compute],NVCCFLAGS,NVCCARCHS)
+  ASTRA_FIND_NVCC_ARCHS([$with_cuda_compute],NVCCFLAGS_EXTRA,NVCCARCHS)
   AC_MSG_RESULT([$NVCCARCHS])
 fi
 
@@ -146,7 +145,7 @@ fi
 AC_SUBST(HAVECUDA)
 AC_SUBST(LDFLAGS_CUDA)
 AC_SUBST(CPPFLAGS_CUDA)
-AC_SUBST(NVCCFLAGS)
+AC_SUBST(NVCCFLAGS_EXTRA)
 
 
 # mex, matlab
@@ -214,12 +213,19 @@ assert(LooseVersion(Cython.__version__)>=LooseVersion("0.13"))
   fi
   AC_MSG_RESULT(yes)
   AC_MSG_CHECKING(for six module)
-  ASTRA_TRY_PYTHON([import six])
+  ASTRA_TRY_PYTHON([import six],,HAVEPYTHON=no)
   if test x$HAVEPYTHON = xno; then
     AC_MSG_RESULT(no)
     AC_MSG_ERROR(You need the six module to use the ASTRA toolbox in Python)
   fi
   AC_MSG_RESULT(yes)
+  AC_MSG_CHECKING(for scipy module)
+  ASTRA_TRY_PYTHON([import scipy],,HAVEPYTHON=no)
+  if test x$HAVEPYTHON = xno; then
+    AC_MSG_RESULT(no)
+    AC_MSG_ERROR(You need the scipy module to use the ASTRA toolbox in Python)
+  fi
+  AC_MSG_RESULT(yes)
 fi
 
 AC_SUBST(HAVEPYTHON)
@@ -237,6 +243,12 @@ esac
 
 AC_SUBST(CPPFLAGS_OS)
 
+# For some reason, some older versions of autoconf produce a config.status
+# that disables all lines looking like VPATH=@srcdir@
+# (More recent autoconf fixes the too broad matching there.)
+# We use a different variable name as a workaround.
+VPATH_SRCDIR="$srcdir"
+AC_SUBST(VPATH_SRCDIR)
 
 # TODO:
 
@@ -249,6 +261,7 @@ AC_SUBST(CPPFLAGS_OS)
 
 AC_SUBST(SAVED_CPPFLAGS)
 AC_SUBST(SAVED_CXXFLAGS)
+AC_SUBST(SAVED_NVCCFLAGS)
 AC_SUBST(SAVED_LDFLAGS)
 AC_SUBST(SAVED_LIBS)
 AC_CONFIG_FILES([Makefile])