diff options
author | jcorgan | 2008-02-08 23:32:10 +0000 |
---|---|---|
committer | jcorgan | 2008-02-08 23:32:10 +0000 |
commit | 42d9c6f495503d3d9d2db47a9979036c9233f976 (patch) | |
tree | b4d2be737c3ad6836e62dc35c861e987ea3729e0 /config/grc_gr_qtgui.m4 | |
parent | 6bf2c048d94e1c673c06c058b23213cd28292520 (diff) | |
download | gnuradio-42d9c6f495503d3d9d2db47a9979036c9233f976.tar.gz gnuradio-42d9c6f495503d3d9d2db47a9979036c9233f976.tar.bz2 gnuradio-42d9c6f495503d3d9d2db47a9979036c9233f976.zip |
Merged r7478:7608 from michaelld/t186 into trunk. Adds ability to compile GNU Radio modules individually, using already installed dependent libraries and include files. New functionality is enabled using --with-* on configure command line; existing build options should remain unchanged. Nice work by Michael Dickens, still needs documentation update on wiki.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7617 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'config/grc_gr_qtgui.m4')
-rw-r--r-- | config/grc_gr_qtgui.m4 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4 index 05f8b02c2..4dd6ce68e 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 @@ -26,8 +26,14 @@ AC_DEFUN([GRC_GR_QTGUI],[ gr-qtgui/src/lib/Makefile \ ]) - # Check for package qt or qt-mt, set QT_CFLAGS and QT_LIBS passed=yes + # Don't do gr-qtgui if gnuradio-core skipped + if test x$gnuradio_core_skipped = xyes; then + AC_MSG_RESULT([Component gr-qtgui requires gnuradio-core, which is not being built or specified via pre-installed files.]) + passed=no + fi + + # Check for package qt or qt-mt, set QT_CFLAGS and QT_LIBS 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])]) |