projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pfbclk'
[debian/gnuradio]
/
config
/
grc_gr_wxgui.m4
diff --git
a/config/grc_gr_wxgui.m4
b/config/grc_gr_wxgui.m4
index e1a3fe4c9604283872e5ac1e84c2f9c02434f1d6..c443f7c6c2f3826631a00458a989fed29c633c0e 100644
(file)
--- a/
config/grc_gr_wxgui.m4
+++ b/
config/grc_gr_wxgui.m4
@@
-19,7
+19,6
@@
dnl Boston, MA 02110-1301, USA.
AC_DEFUN([GRC_GR_WXGUI],[
GRC_ENABLE(gr-wxgui)
AC_DEFUN([GRC_GR_WXGUI],[
GRC_ENABLE(gr-wxgui)
-
GRC_WITH(gr-wxgui)
dnl Don't do gr-wxgui if gnuradio-core skipped
GRC_WITH(gr-wxgui)
dnl Don't do gr-wxgui if gnuradio-core skipped
@@
-30,10
+29,8
@@
AC_DEFUN([GRC_GR_WXGUI],[
dnl yes : if the --enable code passed muster and all dependencies are met
dnl no : otherwise
if test $passed = yes; then
dnl yes : if the --enable code passed muster and all dependencies are met
dnl no : otherwise
if test $passed = yes; then
- dnl Don't do gr-wxgui if wxPython is not available
- if ! ${PYTHON} -c 'import wx'; then
- passed=no
- fi
+ PYTHON_CHECK_MODULE([wx],[Python wxWidgets wrappers >= 2.8],[],[passed=no],[wx.version().split()[[0]] >= "2.8"])
+ PYTHON_CHECK_MODULE([numpy],[Numeric Python extensions],[],[passed=no])
fi
AC_CONFIG_FILES([ \
fi
AC_CONFIG_FILES([ \
@@
-41,7
+38,7
@@
AC_DEFUN([GRC_GR_WXGUI],[
gr-wxgui/gr-wxgui.pc \
gr-wxgui/src/Makefile \
gr-wxgui/src/python/Makefile \
gr-wxgui/gr-wxgui.pc \
gr-wxgui/src/Makefile \
gr-wxgui/src/python/Makefile \
- gr-wxgui/src/python/plotter/Makefile \
+
gr-wxgui/src/python/plotter/Makefile \
])
GRC_BUILD_CONDITIONAL(gr-wxgui)
])
GRC_BUILD_CONDITIONAL(gr-wxgui)