Update revision to 3.3.0-rc0

[debian/gnuradio] / config / grc_grc.m4

diff --git a/config/grc_grc.m4 b/config/grc_grc.m4
index e2b63f515962a5ba12df9f340b6c6f358f6e3f7a..16720b8fed4cf5f5396f906fdae0a7695bfc380d 100644 (file)
--- a/config/grc_grc.m4
+++ b/config/grc_grc.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2008 Free Software Foundation, Inc.
+dnl Copyright 2008, 2009 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Radio
 dnl
@@ -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 >= 1.3.6],[],[passed=no],[lxml.etree.LXML_VERSION >= (1, 3, 6, 0)])
+        PYTHON_CHECK_MODULE([gtk],[Python gtk wrappers >= 2.10.0],[],[passed=no],[gtk.pygtk_version >= (2, 10, 0)])
     fi
 
     dnl ########################################
@@ -53,26 +48,13 @@ AC_DEFUN([GRC_GRC],[
 
     AC_CONFIG_FILES([ \
         grc/Makefile \
-        grc/data/Makefile \
-        grc/data/grc/Makefile \
-        grc/data/grc_gnuradio/Makefile \
-        grc/data/grc_gnuradio/blocks/Makefile \
-        grc/src/Makefile \
-        grc/src/grc/Makefile \
-        grc/src/grc/gui/Makefile \
-        grc/src/grc/gui/elements/Makefile \
-        grc/src/grc/elements/Makefile \
-        grc/src/grc_gnuradio/Makefile \
-        grc/src/grc_gnuradio/blks2/Makefile \
-        grc/src/grc_gnuradio/usrp/Makefile \
-        grc/src/grc_gnuradio/utils/Makefile \
-        grc/src/grc_gnuradio/wxgui/Makefile \
+        grc/base/Makefile \
+        grc/blocks/Makefile \
+        grc/freedesktop/Makefile \
+        grc/grc_gnuradio/Makefile \
+        grc/gui/Makefile \
+        grc/python/Makefile \
         grc/scripts/Makefile \
-        grc/examples/Makefile \
-        grc/examples/audio/Makefile \
-        grc/examples/simple/Makefile \
-        grc/examples/usrp/Makefile \
-        grc/examples/xmlrpc/Makefile \
     ])
 
     GRC_BUILD_CONDITIONAL(grc)