[Commit-gnuradio] r4764 - in gnuradio/branches/developers/n4hy/ofdm: config gr-qtgui/src/lib

[n4hy]

Author: n4hy
Date: 2007-03-16 07:38:08 -0600 (Fri, 16 Mar 2007)
New Revision: 4764

Modified:
   gnuradio/branches/developers/n4hy/ofdm/config/gr_qwt.m4
   gnuradio/branches/developers/n4hy/ofdm/gr-qtgui/src/lib/fftdisplay.cc
   gnuradio/branches/developers/n4hy/ofdm/gr-qtgui/src/lib/fftdisplay.h
Log:
merge -r 4761:4763 trunk gr-qtgui enabled

Modified: gnuradio/branches/developers/n4hy/ofdm/config/gr_qwt.m4
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm/config/gr_qwt.m4     2007-03-15 
22:12:28 UTC (rev 4763)
+++ gnuradio/branches/developers/n4hy/ofdm/config/gr_qwt.m4     2007-03-16 
13:38:08 UTC (rev 4764)
@@ -55,16 +55,16 @@
     CPPFLAGS="$CPPFLAGS $QT_CFLAGS $QWT_CFLAGS"
 
     dnl Check for presence of header files
-    AC_CHECK_HEADERS([qwt/qwt.h], 
+    AC_CHECK_HEADERS([qwt.h], 
                     [],
                     [libqwt_ok=no;AC_MSG_RESULT([cannot find usable qwt 
headers])]
     )
 
     dnl Set QWT_LIBS based on user input
     AC_MSG_CHECKING(QWT_LIBS)
-    QWT_LIBS="-lqwt"
+    QWT_LIBS="$QWT_LIBS -lqwt"
     if test "$qwt_libdir" != "" ; then
-       QWT_LIBS=" -L$qwt_libdir $QWT_LIBS"
+       QWT_LIBS="-L$qwt_libdir $QWT_LIBS"
     fi
     AC_MSG_RESULT($QWT_LIBS)
 
@@ -73,8 +73,8 @@
 
     dnl Check that library files can be linked in
     dnl This references an arbitrary static class method 
-    AC_TRY_LINK([#include <qwt/qwt_text.h>],
-               [Qt::TextFormat tf = QwtText::defaultFormat()],
+    AC_TRY_LINK([#include <qwt_text.h>],
+               [QwtTextEngine const *te = 
QwtText::textEngine(QwtText::AutoText)],
                [],
                 [libqwt_ok=no;AC_MSG_RESULT([unable to link QWT library])]
     )

Modified: gnuradio/branches/developers/n4hy/ofdm/gr-qtgui/src/lib/fftdisplay.cc
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm/gr-qtgui/src/lib/fftdisplay.cc       
2007-03-15 22:12:28 UTC (rev 4763)
+++ gnuradio/branches/developers/n4hy/ofdm/gr-qtgui/src/lib/fftdisplay.cc       
2007-03-16 13:38:08 UTC (rev 4764)
@@ -1,10 +1,10 @@
 #ifndef FFT_DISPLAY_CC
 #define FFT_DISPLAY_CC
 
-#include <qwt/qwt_painter.h>
-#include <qwt/qwt_plot_canvas.h>
-#include <qwt/qwt_plot_curve.h>
-#include <qwt/qwt_scale_engine.h>
+#include <qwt_painter.h>
+#include <qwt_plot_canvas.h>
+#include <qwt_plot_curve.h>
+#include <qwt_scale_engine.h>
 #include <qapplication.h>
 #include <fftdisplay.h>
 

Modified: gnuradio/branches/developers/n4hy/ofdm/gr-qtgui/src/lib/fftdisplay.h
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm/gr-qtgui/src/lib/fftdisplay.h        
2007-03-15 22:12:28 UTC (rev 4763)
+++ gnuradio/branches/developers/n4hy/ofdm/gr-qtgui/src/lib/fftdisplay.h        
2007-03-16 13:38:08 UTC (rev 4764)
@@ -6,7 +6,7 @@
 #include <vector>
 
 #include <qwidget.h>
-#include <qwt/qwt_plot.h>
+#include <qwt_plot.h>
 #include <qevent.h>
 
 class fft_display_event:public QCustomEvent{