diff options
| author | Tom Rondeau | 2011-01-22 14:08:19 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-01-22 14:08:19 -0500 |
| commit | 5ad1695febf1f0ef2055693b3af385470c0f66a5 (patch) | |
| tree | a995475327ad50defb744e446ee56229056a50ff | |
| parent | e7b1639edb668face7e9ab611887c4df6e5a0ac8 (diff) | |
| parent | 16d98959849ae93a062d03f130a6f86ce22996a1 (diff) | |
| download | gnuradio-5ad1695febf1f0ef2055693b3af385470c0f66a5.tar.gz gnuradio-5ad1695febf1f0ef2055693b3af385470c0f66a5.tar.bz2 gnuradio-5ad1695febf1f0ef2055693b3af385470c0f66a5.zip | |
Merge branch 'mergeme/grc/config_check_fix' into next
| -rw-r--r-- | config/grc_grc.m4 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/config/grc_grc.m4 b/config/grc_grc.m4 index 446bba3c5..c21acccff 100644 --- a/config/grc_grc.m4 +++ b/config/grc_grc.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2008, 2009 Free Software Foundation, Inc. +dnl Copyright 2008, 2009, 2011 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -20,8 +20,6 @@ dnl Boston, MA 02110-1301, USA. AC_DEFUN([GRC_GRC],[ GRC_ENABLE(grc) -dnl GRC_CHECK_DEPENDENCY(grc, gr-wxgui) - AC_CHECK_PROG(XDG_UTILS, xdg-mime, true, false) AM_CONDITIONAL(XDG_UTILS, $XDG_UTILS) @@ -33,6 +31,7 @@ dnl GRC_CHECK_DEPENDENCY(grc, gr-wxgui) 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)]) + PYTHON_CHECK_MODULE([numpy],[NumPy],[],[passed=no],[True]) fi dnl ######################################## |