[Commit-gnuradio] r4762 - in gnuradio/trunk: config gr-qtgui/src/lib

[jcorgan]

Author: jcorgan
Date: 2007-03-15 15:23:49 -0600 (Thu, 15 Mar 2007)
New Revision: 4762

Modified:
   gnuradio/trunk/config/gr_qwt.m4
   gnuradio/trunk/gr-qtgui/src/lib/fftdisplay.cc
   gnuradio/trunk/gr-qtgui/src/lib/fftdisplay.h
Log:
Cleanup on qwt config to not require qwt includes to be in a subdirectory.

Modified: gnuradio/trunk/config/gr_qwt.m4
===================================================================
--- gnuradio/trunk/config/gr_qwt.m4     2007-03-15 19:37:41 UTC (rev 4761)
+++ gnuradio/trunk/config/gr_qwt.m4     2007-03-15 21:23:49 UTC (rev 4762)
@@ -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="$QWT_LIBS -L$qwt_libdir"
+       QWT_LIBS="-L$qwt_libdir $QWT_LIBS"
     fi
     AC_MSG_RESULT($QWT_LIBS)
 

Modified: gnuradio/trunk/gr-qtgui/src/lib/fftdisplay.cc
===================================================================
--- gnuradio/trunk/gr-qtgui/src/lib/fftdisplay.cc       2007-03-15 19:37:41 UTC 
(rev 4761)
+++ gnuradio/trunk/gr-qtgui/src/lib/fftdisplay.cc       2007-03-15 21:23:49 UTC 
(rev 4762)
@@ -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/trunk/gr-qtgui/src/lib/fftdisplay.h
===================================================================
--- gnuradio/trunk/gr-qtgui/src/lib/fftdisplay.h        2007-03-15 19:37:41 UTC 
(rev 4761)
+++ gnuradio/trunk/gr-qtgui/src/lib/fftdisplay.h        2007-03-15 21:23:49 UTC 
(rev 4762)
@@ -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{