From: nge <nge>
Date: Tue, 6 Oct 2009 15:17:13 +0000 (+0000)
Subject: To see which qwt we're using in configure log
X-Git-Tag: V5_1_3rc1~9
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=81b3bdfa7f10a6aa86ea9bf383b551afa41a2c9f;p=modules%2Fgui.git

To see which qwt we're using in configure log
If Qt3 and Qt4 headers natively installed, fix detection by checking qwt headers in include/qwt-qt4 directory first
---

diff --git a/adm_local/unix/config_files/check_qwt.m4 b/adm_local/unix/config_files/check_qwt.m4
index 6d9dcb82c..bae22ac31 100644
--- a/adm_local/unix/config_files/check_qwt.m4
+++ b/adm_local/unix/config_files/check_qwt.m4
@@ -47,6 +47,7 @@ AC_ARG_WITH(qwt_inc,
 libqwt_name=qwt
 if test -z $QWTHOME; then
   AC_MSG_RESULT(QWTHOME not defined)
+  AC_MSG_NOTICE(Trying native Qwt...)
   exist_ok=no	
   if test "x$exist_ok" = "xno"; then
      for d in /usr /usr/local ; do
@@ -78,21 +79,22 @@ if test -z $QWTHOME; then
   fi
   if test "x$exist_ok" = "xyes"; then
      if test -z $QWT_INCDIR; then
-        QWT_INCDIR=$QWTHOME"/include/qwt"
+        QWT_INCDIR=$QWTHOME"/include/qwt-qt4"
         if test ! -f $QWT_INCDIR/qwt.h ; then
-          QWT_INCDIR=$QWTHOME"/include"
+          QWT_INCDIR=/usr/include/qwt
         fi
         if test ! -f $QWT_INCDIR/qwt.h ; then
-          QWT_INCDIR=/usr/lib/qt4/include/qwt
+          QWT_INCDIR=$QWTHOME"/include"
         fi
         if test ! -f $QWT_INCDIR/qwt.h ; then
-          QWT_INCDIR=/usr/include/qwt-qt4
+          QWT_INCDIR=/usr/lib/qt4/include/qwt
         fi
      fi
   else
      qwt_ok=no
   fi
 else
+  AC_MSG_NOTICE(Trying Qwt from $QWTHOME ...)
   if test -z $QWT_INCDIR; then
      QWT_INCDIR="$QWTHOME/include"
   fi