From: Daniel Elstner <redacted>
Date: Tue, 15 Sep 2015 16:26:51 +0000 (+0200)
Subject: configure: Check for numpy Python module
X-Git-Tag: libsigrok-0.4.0~286
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=eb2373f1674706bd050c9b7c00927e42b70ea0f2;p=libsigrok.git

configure: Check for numpy Python module

This fixes bug #533.
---

diff --git a/configure.ac b/configure.ac
index d773d7f2..5b894654 100644
--- a/configure.ac
+++ b/configure.ac
@@ -346,15 +346,22 @@ PKG_CHECK_EXISTS([pygobject-3.0 < 3.7.91],
 	[AC_DEFINE([PYGOBJECT_FLAGS_SIGNED], [1],
 		[Whether last argument to pyg_flags_get_value() is signed.])])
 
-# The Python bindings need the setuptools Python module.
-# We'll let it go through even if the AX macro wasn't found,
-# as the Python module may still be there.
-HAVE_PYMOD_SETUPTOOLS=yes
-m4_ifdef([AX_PYTHON_MODULE],
-	[AX_PYTHON_MODULE([setuptools])],
-	[m4_warn([unsupported], [Missing macro AX_PYTHON_MODULE: no setuptools check])])
+# The Python bindings need the setuptools and numpy Python modules.
+# We'll let it go through even if the AX macro wasn't found, as the
+# Python modules may still be there.
+m4_ifdef([AX_PYTHON_MODULE], [
+	AX_PYTHON_MODULE([setuptools])
+	AX_PYTHON_MODULE([numpy])
+], [
+	HAVE_PYMOD_SETUPTOOLS=yes
+	HAVE_PYMOD_NUMPY=yes
+	m4_warn([unsupported],
+		[Missing macro AX_PYTHON_MODULE: no check for setuptools and numpy])
+])
 AS_IF([test "x$HAVE_PYMOD_SETUPTOOLS" != xyes],
 	[SR_APPEND([sr_python_missing], [', '], [setuptools])])
+AS_IF([test "x$HAVE_PYMOD_NUMPY" != xyes],
+	[SR_APPEND([sr_python_missing], [', '], [numpy])])
 
 # The Python bindings use SWIG to generate code.
 AC_CHECK_PROGS([SWIG], [swig swig3.0 swig2.0])