--- src3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_qwt.m4 2009-04-02 11:20:55.002849314 +0100 +++ src3.2.6-v01/GUI_SRC_3.2.6/adm_local/unix/config_files/check_qwt.m4 2009-04-02 11:37:53.000071101 +0100 @@ -47,18 +47,18 @@ fi if test "x$exits_ok" = "xyes"; then if test -z $QWT_INCLUDES; then - QWT_INCLUDES=$QWTHOME"/include/qwt" - if test ! -f $QWT_INCLUDES/qwt.h ; then - QWT_INCLUDES=$QWTHOME"/include" + QWT_INCLUDES=-I$QWTHOME"/include/qwt" + if test ! -f ${QWT_INCLUDES:2}/qwt.h ; then + QWT_INCLUDES=-I$QWTHOME"/include" fi - if test ! -f $QWT_INCLUDES/qwt.h ; then - QWT_INCLUDES=/usr/lib/qt3/include/qwt + if test ! -f ${QWT_INCLUDES:2}/qwt.h ; then + QWT_INCLUDES=-I/usr/lib/qt3/include/qwt fi fi fi else if test -z $QWT_INCLUDES; then - QWT_INCLUDES="$QWTHOME/include" + QWT_INCLUDES=-I"$QWTHOME/include" fi fi @@ -70,7 +70,7 @@ AC_LANG_SAVE AC_LANG_CPLUSPLUS CPPFLAGS_old=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$QWT_INCLUDES" + CPPFLAGS="$CPPFLAGS $QWT_INCLUDES" CPPFLAGS="$CPPFLAGS $QT_INCLUDES" AC_CHECK_HEADER(qwt.h,qwt_ok=yes,qwt_ok=no) @@ -102,7 +102,7 @@ fi CXXFLAGS_old=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $QT_INCLUDES -I$QWT_INCLUDES" + CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QWT_INCLUDES" AC_CACHE_VAL(salome_cv_lib_qwt,[ AC_TRY_LINK( @@ -123,7 +123,7 @@ AC_MSG_RESULT(unable to link with qwt library) AC_MSG_RESULT(QWTHOME environment variable may be wrong) else - QWT_INCLUDES="-I$QWT_INCLUDES" + #QWT_INCLUDES="-I$QWT_INCLUDES" if test "x$QWTHOME" = "x/usr" then QWT_LIBS=" -lqwt"