X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config%2Fgrc_grc.m4;h=07463a52c60da091ce4084e8bdf97a6369888a12;hb=f23f2dee67cf7a0e3aa7ccfbf889ecc2177826bf;hp=c8ea1099d3fd4525ad6c9b235b5ac045f93d5181;hpb=c86f6c23c6883f73d953d64c28ab42cedb77e4d7;p=debian%2Fgnuradio

diff --git a/config/grc_grc.m4 b/config/grc_grc.m4
index c8ea1099..07463a52 100644
--- a/config/grc_grc.m4
+++ b/config/grc_grc.m4
@@ -22,22 +22,17 @@ AC_DEFUN([GRC_GRC],[
 
     GRC_CHECK_DEPENDENCY(grc, gr-wxgui)
 
+    AC_CHECK_PROG(XDG_UTILS, xdg-mime, true, false)
+    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 ########################################
@@ -69,6 +64,7 @@ AC_DEFUN([GRC_GRC],[
         grc/examples/usrp/Makefile \
         grc/examples/audio/Makefile \
         grc/examples/simple/Makefile \
+        grc/examples/trellis/Makefile \
         grc/Makefile \
         grc/data/Makefile \
         grc/data/platforms/Makefile \
@@ -76,6 +72,7 @@ AC_DEFUN([GRC_GRC],[
         grc/data/platforms/python/Makefile \
         grc/data/platforms/python/blocks/Makefile \
         grc/scripts/Makefile \
+        grc/freedesktop/Makefile \
     ])
 
     GRC_BUILD_CONDITIONAL(grc)