Merge branch 'usrp2-real-fix' of http://gnuradio.org/git/balister into master

[debian/gnuradio] / config / grc_gr_qtgui.m4

diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4
index 4a717c6588020830d3b503a9c9721881e612151c..d9700776cae2fc994f2e954ff06093fafdc632e9 100644 (file)
--- a/config/grc_gr_qtgui.m4
+++ b/config/grc_gr_qtgui.m4
@@ -28,6 +28,14 @@ AC_DEFUN([GRC_GR_QTGUI],[
     dnl   yes  : if the --enable code passed muster and all dependencies are met
     dnl   no   : otherwise
 
+    PYTHON_CHECK_MODULE([PyQt4.QtCore], [PyQt4 for Qt4], \
+       [passed=yes], [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])
 
 # Check for: 
 #      QtOpenGL
@@ -41,12 +49,12 @@ AC_DEFUN([GRC_GR_QTGUI],[
 
     if test $passed = yes; then
         dnl Check for package qt or qt-mt, set QT_CFLAGS and QT_LIBS
-        PKG_CHECK_MODULES(QTCORE, QtCore >= 4.3.4, [],
-           [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtCore.])])
-        PKG_CHECK_MODULES(QTGUI, QtGui >= 4.3.4, [],
-           [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtGui.])])
-        PKG_CHECK_MODULES(QTOPENGL, QtOpenGL >= 4.3.4, [],
-           [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtOpenGL.])])
+        PKG_CHECK_MODULES(QTCORE, QtCore >= 4.2, [],
+           [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtCore >= 4.2.])])
+        PKG_CHECK_MODULES(QTGUI, QtGui >= 4.2, [],
+           [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtGui >= 4.2.])])
+        PKG_CHECK_MODULES(QTOPENGL, QtOpenGL >= 4.2, [],
+           [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtOpenGL >- 4.2.])])
        
         dnl Fetch QWT variables
         GR_QWT([], [passed=no])
@@ -78,6 +86,12 @@ AC_DEFUN([GRC_GR_QTGUI],[
        AC_SUBST(QT_UIC_EXEC)
     fi
 
+    if test "$passed" = "no"; then
+        AM_CONDITIONAL(BUILD_QT, false)
+    else
+       AM_CONDITIONAL(BUILD_QT, true)
+    fi
+
     AC_CONFIG_FILES([ \
         gr-qtgui/Makefile \
         gr-qtgui/src/Makefile \