summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authortrondeau2009-03-06 03:07:09 +0000
committertrondeau2009-03-06 03:07:09 +0000
commit96cb773ed47079d47f6d4bf75fd8fdb60cb17e27 (patch)
tree7fb4d9dd5e7a2b9889fe84499f7a053db4747cac /config
parent8bae90aecb4e5d876cf341167e99873122f49805 (diff)
downloadgnuradio-96cb773ed47079d47f6d4bf75fd8fdb60cb17e27.tar.gz
gnuradio-96cb773ed47079d47f6d4bf75fd8fdb60cb17e27.tar.bz2
gnuradio-96cb773ed47079d47f6d4bf75fd8fdb60cb17e27.zip
merging qtdevel branch -r10534:10564 to sync with trunk because my computer got confused which branch it was supposed to work on. Confused and annoyed and fixing it.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10565 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'config')
-rw-r--r--config/grc_gr_qtgui.m412
1 files changed, 6 insertions, 6 deletions
diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4
index 54bdb2d3b..a62612904 100644
--- a/config/grc_gr_qtgui.m4
+++ b/config/grc_gr_qtgui.m4
@@ -41,12 +41,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])