X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config%2Fgrc_gr_wxgui.m4;h=c443f7c6c2f3826631a00458a989fed29c633c0e;hb=acdf13612f55c3a4abd4f2f05d759a4fd2fdf7d0;hp=522c62520e6e419db6299d7feeb5b3c04d514389;hpb=90e4faa68bbb21a21a459755942756686985ba46;p=debian%2Fgnuradio diff --git a/config/grc_gr_wxgui.m4 b/config/grc_gr_wxgui.m4 index 522c6252..c443f7c6 100644 --- 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) - 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 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([ \ @@ -41,6 +38,7 @@ AC_DEFUN([GRC_GR_WXGUI],[ gr-wxgui/gr-wxgui.pc \ gr-wxgui/src/Makefile \ gr-wxgui/src/python/Makefile \ + gr-wxgui/src/python/plotter/Makefile \ ]) GRC_BUILD_CONDITIONAL(gr-wxgui)