From a63a5e701f5c257d10ccd98452fd7e296eb7e9a3 Mon Sep 17 00:00:00 2001
From: jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Thu, 15 Mar 2007 21:23:49 +0000
Subject: [PATCH] Cleanup on qwt config to not require qwt includes to be in a
 subdirectory.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4762 221aa14e-8319-0410-a670-987f0aec2ac5
---
 config/gr_qwt.m4               | 6 +++---
 gr-qtgui/src/lib/fftdisplay.cc | 8 ++++----
 gr-qtgui/src/lib/fftdisplay.h  | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/gr_qwt.m4 b/config/gr_qwt.m4
index 544362c5..8f4957af 100644
--- a/config/gr_qwt.m4
+++ b/config/gr_qwt.m4
@@ -55,16 +55,16 @@ AC_DEFUN([GR_QWT],
     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)
 
diff --git a/gr-qtgui/src/lib/fftdisplay.cc b/gr-qtgui/src/lib/fftdisplay.cc
index a87e0c09..d7016428 100644
--- a/gr-qtgui/src/lib/fftdisplay.cc
+++ b/gr-qtgui/src/lib/fftdisplay.cc
@@ -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>
 
diff --git a/gr-qtgui/src/lib/fftdisplay.h b/gr-qtgui/src/lib/fftdisplay.h
index c58de862..c567e88f 100644
--- a/gr-qtgui/src/lib/fftdisplay.h
+++ b/gr-qtgui/src/lib/fftdisplay.h
@@ -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{
-- 
2.47.2