diff options
| author | Josh Blum <josh@joshknows.com> | 2011-03-07 12:45:06 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-03-07 12:45:06 -0800 |
| commit | d658659c4cb72385f921a03c37bb58b452190aab (patch) | |
| tree | 0b8ae4fe66de15ecf9df4bea1fcb9ff5749dbef9 | |
| parent | 4e0fb789e55e26bc16990a257c57494f3d3e6100 (diff) | |
qtgui-grc: added check for pyqwt in config
| -rw-r--r-- | config/grc_gr_qtgui.m4 | 11 | ||||
| -rw-r--r-- | config/grc_grc.m4 | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4 index c14f984c3c..92392c8835 100644 --- a/config/grc_gr_qtgui.m4 +++ b/config/grc_gr_qtgui.m4 @@ -29,13 +29,12 @@ AC_DEFUN([GRC_GR_QTGUI],[ dnl no : otherwise PYTHON_CHECK_MODULE([PyQt4.QtCore], [PyQt4 for Qt4], \ - [passed=yes], [passed=no], \ - [PyQt4.QtCore.PYQT_VERSION >= 260000]) + [], [passed=no], \ + [PyQt4.QtCore.PYQT_VERSION >= 260000]) - # Enable this if we want to test for PyQwt, too - #PYTHON_CHECK_MODULE([PyQt4.Qwt5], [PyQwt5 for Qt4], \ - # [passed=yes], [passed=no], \ - # [PyQt4.Qwt5.QWT_VERSION >= 327000]) + PYTHON_CHECK_MODULE([PyQt4.Qwt5], [PyQwt5 for Qt4], \ + [], [passed=no], \ + [PyQt4.Qwt5.QWT_VERSION >= 327000]) # Check for: # QtOpenGL diff --git a/config/grc_grc.m4 b/config/grc_grc.m4 index 9aff3cd1df..c21acccff5 100644 --- a/config/grc_grc.m4 +++ b/config/grc_grc.m4 @@ -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) |