X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config%2Fgrc_grc.m4;h=16720b8fed4cf5f5396f906fdae0a7695bfc380d;hb=04db1ec3b6dad9d984f7fe4314cca6937c94a1b0;hp=bb287fd1b6afe308731e226bf0fc71890fa4fe95;hpb=373dd3bd1f46d09eb2ef2e4aeefe3f1be58c6ab1;p=debian%2Fgnuradio

diff --git a/config/grc_grc.m4 b/config/grc_grc.m4
index bb287fd1..16720b8f 100644
--- 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
@@ -26,34 +26,13 @@ AC_DEFUN([GRC_GRC],[
     AM_CONDITIONAL(XDG_UTILS, $XDG_UTILS)
 
     dnl ########################################
-    dnl # test python version
-    dnl ########################################
-    AC_MSG_CHECKING([for Python version 2.5])
-    if test `${PYTHON} -c "import sys; print sys.version.split()[[0]] >= '2.5'"` = 'True'; then
-        AC_MSG_RESULT([yes])
-    else
-        AC_MSG_RESULT([no])
-        passed=no
-    fi
-
-    dnl ########################################
-    dnl # test python dependencies
+    dnl # test python modules and versions
     dnl ########################################
     if test $passed = yes; then
-        PYTHON_CHECK_MODULE([Cheetah],[Python Cheetah templates],[],[passed=no])
-        PYTHON_CHECK_MODULE([pygtk],[Python GTK wrappers],[],[passed=no])
-        PYTHON_CHECK_MODULE([lxml],[Python XML wrappers],[],[passed=no])
-    fi
-
-    dnl ########################################
-    dnl # test gtk version
-    dnl ########################################
-    AC_MSG_CHECKING([for GTK version >= 2.10.0])
-    if test `${PYTHON} -c "import gtk; print gtk.pygtk_version >= (2, 10, 0)"` = 'True'; then
-        AC_MSG_RESULT([yes])
-    else
-        AC_MSG_RESULT([no])
-        passed=no
+        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 ########################################
@@ -68,32 +47,14 @@ AC_DEFUN([GRC_GRC],[
     AC_SUBST(PYTHONW)
 
     AC_CONFIG_FILES([ \
-        grc/src/grc_gnuradio/Makefile \
-        grc/src/grc_gnuradio/wxgui/Makefile \
-        grc/src/grc_gnuradio/blks2/Makefile \
-        grc/src/grc_gnuradio/usrp/Makefile \
-        grc/src/Makefile \
-        grc/src/platforms/Makefile \
-        grc/src/platforms/base/Makefile \
-        grc/src/platforms/python/Makefile \
-        grc/src/platforms/python/utils/Makefile \
-        grc/src/platforms/gui/Makefile \
-        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/examples/trellis/Makefile \
         grc/Makefile \
-        grc/data/Makefile \
-        grc/data/platforms/Makefile \
-        grc/data/platforms/base/Makefile \
-        grc/data/platforms/python/Makefile \
-        grc/data/platforms/python/blocks/Makefile \
-        grc/scripts/Makefile \
+        grc/base/Makefile \
+        grc/blocks/Makefile \
         grc/freedesktop/Makefile \
+        grc/grc_gnuradio/Makefile \
+        grc/gui/Makefile \
+        grc/python/Makefile \
+        grc/scripts/Makefile \
     ])
 
     GRC_BUILD_CONDITIONAL(grc)