X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config%2Fgrc_gr_qtgui.m4;h=4027bb332bd4f02cf9d40e7e7966f0ab3d6b85d3;hb=3751671d1b596113e441ca326280bdcc94fdcc6f;hp=05f8b02c2b157371e91eeaceb44d564fbacf616d;hpb=937b719d2e57d0497293d603da10cac2532346f6;p=debian%2Fgnuradio

diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4
index 05f8b02c..4027bb33 100644
--- a/config/grc_gr_qtgui.m4
+++ b/config/grc_gr_qtgui.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
 dnl 
 dnl This file is part of GNU Radio
 dnl 
@@ -18,27 +18,74 @@ dnl the Free Software Foundation, Inc., 51 Franklin Street,
 dnl Boston, MA 02110-1301, USA.
 
 AC_DEFUN([GRC_GR_QTGUI],[
-    GRC_ENABLE([gr-qtgui])
+    GRC_ENABLE(gr-qtgui)
 
-    AC_CONFIG_FILES([ \
-	  gr-qtgui/Makefile \
-	  gr-qtgui/src/Makefile \
-	  gr-qtgui/src/lib/Makefile \
-    ])
+    dnl Don't do gr-qtgui if gnuradio-core skipped
+    GRC_CHECK_DEPENDENCY(gr-qtgui, gnuradio-core)
+
+    dnl If execution gets to here, $passed will be:
+    dnl   with : if the --with code didn't error out
+    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
+#	QtGui
+#	QtCore
+#	qwt 
+#	qt4
 
-    # Check for package qt or qt-mt, set QT_CFLAGS and QT_LIBS
-    passed=yes
-    PKG_CHECK_MODULES(QT, qt >= 3.3,[],
-    [passed=no;AC_MSG_RESULT([gr-qtgui requires libqt or libqt-mt, libqt not found. Checking for libqt-mt])])
+# qt4-core, qt4-gui, qwt5-qt4, qwt5-qt4-dev, qt4-dev-tools
 
-    if test x$passed == xno; then
-	passed=yes
-	PKG_CHECK_MODULES(QT, qt-mt >= 3.3,[],
-    	[passed=no;AC_MSG_RESULT([gr-qtgui requires libqt or libqt-mt, neither found.])])
+    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.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])
+
+	dnl Export the include dirs and libraries (note: QTOPENGL_LIBS includes links
+	dnl to QtCore and QtGui libraries)
+	QT_INCLUDES="$QWT_CFLAGS $QTCORE_CFLAGS $QTGUI_CFLAGS"
+	QT_LIBS="$QWT_LIBS $QTOPENGL_LIBS"
+
+        dnl Build an includes variable specifically for running qmake by extracting
+        dnl all includes from the QWT, without the -I;
+        dnl qmake appends the -I when processing the project file INCLUDEPATH
+        for i in $QWT_CFLAGS; do
+            QMAKE_INCLUDES="$QMAKE_INCLUDES ${i##-I}"
+        done
+
+	QT_MOC_EXEC=`pkg-config --variable=moc_location QtCore`
+	QT_UIC_EXEC=`pkg-config --variable=uic_location QtCore`
+
+        AC_SUBST(QMAKE_INCLUDES)
+        AC_SUBST(QT_INCLUDES)
+	AC_SUBST(QT_LIBS)
+	AC_SUBST(QT_MOC_EXEC)
+	AC_SUBST(QT_UIC_EXEC)
     fi
 
-    # Fetch QWT variables
-    GR_QWT([], [passed=no])
+    AC_CONFIG_FILES([ \
+        gr-qtgui/Makefile \
+        gr-qtgui/src/Makefile \
+        gr-qtgui/src/lib/Makefile \
+        gr-qtgui/src/python/Makefile \
+    ])
 
-    GRC_BUILD_CONDITIONAL([gr-qtgui],[])
+    GRC_BUILD_CONDITIONAL(gr-qtgui)
 ])