summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorn4hy <n4hy@221aa14e-8319-0410-a670-987f0aec2ac5>2007-02-22 00:08:22 +0000
committern4hy <n4hy@221aa14e-8319-0410-a670-987f0aec2ac5>2007-02-22 00:08:22 +0000
commitd4cb0a656b03540a143765121339557954d67312 (patch)
tree3693d0ee5b97acb417dd6d7ff190edf211b990c1 /config
parent47752e96f57bdc534fe766baaf9d1d162432bf69 (diff)
fix to qt versus qt-mt issues on Fedora and Debian/Ubuntu, qwt is next
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4570 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'config')
-rw-r--r--config/grc_gr_qtgui.m49
1 files changed, 8 insertions, 1 deletions
diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4
index 42174a08ab..300462188a 100644
--- a/config/grc_gr_qtgui.m4
+++ b/config/grc_gr_qtgui.m4
@@ -28,10 +28,17 @@ AC_DEFUN([GRC_GR_QTGUI],[
passed=yes
PKG_CHECK_MODULES(QT, qt >= 3.3,[],
- [passed=no;AC_MSG_RESULT([gr-qtgui requires qt, not found. Check for symlink between qt-mt.pc and qt.pc])])
+ [passed=no;AC_MSG_RESULT([gr-qtgui requires qt, not found. Checking for qt-mt])])
+
+ if test x$passed == xno; then
+ passed=yes
+ PKG_CHECK_MODULES(QT, qt-mt >= 3.3,[],
+ [passed=no;AC_MSG_RESULT([gr-qtgui requires qt, not found. Checking for qt-mt])])
+ fi
PKG_CHECK_MODULES(QWT, qwt >= 5.0.0, [],
[passed=no;AC_MSG_RESULT([gr-qtgui requires qwt, not found.])])
+
GRC_BUILD_CONDITIONAL([gr-qtgui], [
AC_SUBST(QT_LIBS)