[Commit-gnuradio] r9072 - in gnuradio/branches/developers/trondeau/qtgui: . config

[trondeau]

Author: trondeau
Date: 2008-07-30 20:16:32 -0600 (Wed, 30 Jul 2008)
New Revision: 9072

Modified:
   gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4
   gnuradio/branches/developers/trondeau/qtgui/configure.ac
Log:
Adding qtgui back to configure. I have removed the library checks and will work 
to make sure all dependencies are checked later. We have moved to QT 4, too.

Modified: gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4  
2008-07-31 01:55:59 UTC (rev 9071)
+++ gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4  
2008-07-31 02:16:32 UTC (rev 9072)
@@ -27,15 +27,15 @@
     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
-    if test $passed = yes; then
+    #if test $passed = yes; then
        dnl Check for package qt or qt-mt, set QT_CFLAGS and QT_LIBS
-        PKG_CHECK_MODULES(QT, qt >= 3.3, [], [
-           PKG_CHECK_MODULES(QT, qt-mt >= 3.3, [],
-               [passed=no;AC_MSG_RESULT([gr-qtgui requires libqt or libqt-mt, 
neither found.])])])
+        # PKG_CHECK_MODULES(QT, qt >= 3.3, [], [
+       #    PKG_CHECK_MODULES(QT, qt-mt >= 3.3, [],
+       #        [passed=no;AC_MSG_RESULT([gr-qtgui requires libqt or libqt-mt, 
neither found.])])])
 
         dnl Fetch QWT variables
-        GR_QWT([], [passed=no])
-    fi
+        #GR_QWT([], [passed=no])
+    #fi
 
     AC_CONFIG_FILES([ \
         gr-qtgui/Makefile \

Modified: gnuradio/branches/developers/trondeau/qtgui/configure.ac
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/configure.ac    2008-07-31 
01:55:59 UTC (rev 9071)
+++ gnuradio/branches/developers/trondeau/qtgui/configure.ac    2008-07-31 
02:16:32 UTC (rev 9072)
@@ -267,6 +267,7 @@
 GRC_GR_TRELLIS
 GRC_GR_VIDEO_SDL
 GRC_GR_WXGUI
+GRC_GR_QTGUI
 GRC_GR_SOUNDER                 dnl this must come after GRC_USRP
 GRC_GR_UTILS                    dnl this must come after GRC_GR_WXGUI
 GRC_GNURADIO_EXAMPLES          dnl must come last