Changeset 867fb5

Timestamp:

May 19, 2021, 7:06:29 PM (4 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

7ca7d5d

Parents:

7b1824

git-author:

Frederik Heber <frederik.heber@…> (04/23/19 00:16:36)

git-committer:

Frederik Heber <frederik.heber@…> (05/19/21 19:06:29)

Message:

Added BOOST_NUMPY to boost.m4.

• we know require boost 1.64

Files:

• configure.ac (modified) (2 diffs)
• m4/boost.m4 (modified) (2 diffs)

configure.ac

@@ -240 +240 @@
 
 # Boost
-BOOST_REQUIRE([1.40])
+BOOST_REQUIRE([1.64])
 
 # Boost headers only
@@ -268 +268 @@
 BOOST_IOSTREAMS
 BOOST_PROGRAM_OPTIONS
-AS_IF([test x"$enable_python" != x"no"], [BOOST_PYTHON])
+AS_IF([test x"$enable_python" != x"no"], [
+        BOOST_PYTHON
+        BOOST_NUMPY
+        ])
 BOOST_SERIALIZATION
 BOOST_THREADS

m4/boost.m4

@@ -1039 +1039 @@
 
 
+# BOOST_NUMPY([PREFERRED-RT-OPT])
+# --------------------------------
+# Look for Boost.Python.Numpy.  For the documentation of PREFERRED-RT-OPT,
+# see the documentation of BOOST_FIND_LIB above.
+BOOST_DEFUN([Numpy],
+[m4_pattern_allow([^BOOST_PYTHON_(LIBS|LDFLAGS)$])dnl
+LIBS="$LIBS $BOOST_PYTHON_LIBS $BOOST_PYTHON_LIB"
+LDFLAGS="$LDFLAGS $BOOST_PYTHON_LDFLAGS"
+CPPFLAGS="$CPPFLAGS $BOOST_PYTHON_CPPFLAGS"
+BOOST_FIND_LIBS([numpy], [numpy numpy3], [$1],
+                [boost/python/numpy.hpp],
+                [ boost::python::numpy::initialize();], [])
+CPPFLAGS=$boost_numpy_save_CPPFLAGS
+LDFLAGS=$boost_numpy_save_LDFLAGS
+LIBS=$boost_numpy_save_LIBS
+])# BOOST_NUMPY
+
 # BOOST_OPTIONAL()
 # ----------------
@@ -1492 +1509 @@
   # the same defines as GCC's).
   for i in \
+    _BOOST_mingw_test(7, 5) \
+    _BOOST_gcc_test(7, 5) \
     _BOOST_mingw_test(6, 2) \
     _BOOST_gcc_test(6, 2) \