X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config%2Fgrc_grc.m4;h=d8bc02a24df476b81a0cc4c4e60229b51faf899e;hb=a3ba8cf268816af51c4bb39ea7ecd7e85ea0807b;hp=b5ae52cee023c0cfec13a43fe7b979f63213ce11;hpb=3c593c11e470e92372cb0d8d9b28f0eb8a62b22a;p=debian%2Fgnuradio

diff --git a/config/grc_grc.m4 b/config/grc_grc.m4
index b5ae52ce..d8bc02a2 100644
--- a/config/grc_grc.m4
+++ b/config/grc_grc.m4
@@ -26,21 +26,13 @@ AC_DEFUN([GRC_GRC],[
     AM_CONDITIONAL(XDG_UTILS, $XDG_UTILS)
 
     dnl ########################################
-    dnl # test python dependencies
+    dnl # test python modules and versions
     dnl ########################################
     if test $passed = yes; then
-        if ! ${PYTHON} -c 'import Cheetah'; then
-            AC_MSG_RESULT([grc requires the Python Cheetah templates installed, not found.])
-            passed=no
-        fi
-        if ! ${PYTHON} -c 'import pygtk'; then
-            AC_MSG_RESULT([grc requires Python GTK wrappers installed, not found.])
-            passed=no
-        fi
-        if ! ${PYTHON} -c 'import lxml'; then
-            AC_MSG_RESULT([grc requires libxml2 and libxslt wrappers (lxml), not found.])
-            passed=no
-        fi
+        PYTHON_CHECK_MODULE([sys],[Python >= 2.5],[],[passed=no],[sys.version.split()[[0]] >= "2.5"])
+        PYTHON_CHECK_MODULE([Cheetah],[Python Cheetah templates >= 2.0.0],[],[passed=no],[Cheetah.Version >= "2.0.0"])
+        PYTHON_CHECK_MODULE([lxml.etree],[Python lxml wrappers >= 2.0.0],[],[passed=no],[lxml.etree.LXML_VERSION >= (2, 0, 0, 0)])
+        PYTHON_CHECK_MODULE([gtk],[Python gtk wrappers >= 2.10.0],[],[passed=no],[gtk.pygtk_version >= (2, 10, 0)])
     fi
 
     dnl ########################################
@@ -68,10 +60,6 @@ AC_DEFUN([GRC_GRC],[
         grc/src/utils/Makefile \
         grc/src/gui/Makefile \
         grc/examples/Makefile \
-        grc/examples/xmlrpc/Makefile \
-        grc/examples/usrp/Makefile \
-        grc/examples/audio/Makefile \
-        grc/examples/simple/Makefile \
         grc/Makefile \
         grc/data/Makefile \
         grc/data/platforms/Makefile \