diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-03-26 15:27:28 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-03-26 15:27:28 -0400 |
| commit | 42719e65f2a67bd5d7e8a4836783cf954b66b3a0 (patch) | |
| tree | 388872cfdd2da24c4045f997d46388a91755f170 | |
| parent | 068fbaa83fbc931abb4ea22c5ab738e1cb6fb3bb (diff) | |
gr-qtgui: more robust way of checking for QWT-qt4; checks a different header only in QT4 version and check qwt-qt4 directory first to avoid finding qt3 version in qwt directory.
| -rw-r--r-- | config/gr_qwt.m4 | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/config/gr_qwt.m4 b/config/gr_qwt.m4 index 16ec63819d..537348ac6b 100644 --- a/config/gr_qwt.m4 +++ b/config/gr_qwt.m4 @@ -59,25 +59,25 @@ AC_DEFUN([GR_QWT], dnl if not set by user if test "$qwt_incdir" = "" ; then - dnl check qwt/qwt.h (as in Fedora) + dnl check qwt-qt4/qwt.h (as in Ubuntu) AC_CHECK_HEADER( - [qwt/qwt.h], - [qwt_qwt_h=yes], - [qwt_qwt_h=no] + [qwt-qt4/qwt_double_interval.h], + [qwt_qt4_qwt_h=yes], + [qwt_qt4_qwt_h=no] ) dnl If it was found, set the flags and move on - if test "$qwt_qwt_h" = "yes" ; then - QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt" + if test "$qwt_qt4_qwt_h" = "yes" ; then + QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt-qt4" else - dnl otherwise, check qwt-qt4/qwt.h (as in Ubuntu) + dnl check qwt/qwt.h (as in Fedora) AC_CHECK_HEADER( - [qwt-qt4/qwt.h], - [qwt_qt4_qwt_h=yes], - [qwt_qt4_qwt_h=no] + [qwt/qwt_double_interval.h], + [qwt_qwt_h=yes], + [qwt_qwt_h=no] ) dnl if it was found, set the flags and move on - if test "$qwt_qt4_qwt_h" = "yes" ; then - QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt-qt4" + if test "$qwt_qwt_h" = "yes" ; then + QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt" else dnl otherwise, qwt.h wasn't found, so set the flag to no libqwt_ok=no |