PYTHON_CHECK_MODULE: added extra argument for assertion tests (ex: version testing)

[debian/gnuradio] / config / gr_python.m4

diff --git a/config/gr_python.m4 b/config/gr_python.m4
index ea6df49c44c3be821118d91aad7dd23e70a3a394..7479f0533dc921853d8e5bf6057344d007bdc855 100644 (file)
--- a/config/gr_python.m4
+++ b/config/gr_python.m4
@@ -135,20 +135,32 @@ print path
 # $2 - module description
 # $3 - action if found
 # $4 - action if not found
+# $5 - test command
 
 AC_DEFUN([PYTHON_CHECK_MODULE],[
-    AC_MSG_CHECKING([for $2]) 
-    python_cmd='import sys
+    AC_MSG_CHECKING([for $2])
+    dnl ########################################
+    dnl # import and test checking
+    dnl ########################################
+    if test "$5"; then
+        python_cmd='
 try:
     import $1
-except:
-    sys.exit(1)'
-
-    if ! $PYTHON -c "$python_cmd" ; then
-       AC_MSG_RESULT([no])
-       $4
+    assert $5
+except: exit(1)'
+    dnl ########################################
+    dnl # import checking only
+    dnl ########################################
+    else
+        python_cmd='
+try: import $1
+except: exit(1)'
+    fi
+    if ! $PYTHON -c "$python_cmd" 2> /dev/null; then
+        AC_MSG_RESULT([no])
+        $4
     else
-       AC_MSG_RESULT([yes])
-       $3
+        AC_MSG_RESULT([yes])
+        $3
     fi
 ])