|
Lines 47-64
Link Here
|
| 47 |
fi |
47 |
fi |
| 48 |
if test "x$exits_ok" = "xyes"; then |
48 |
if test "x$exits_ok" = "xyes"; then |
| 49 |
if test -z $QWT_INCLUDES; then |
49 |
if test -z $QWT_INCLUDES; then |
| 50 |
QWT_INCLUDES=$QWTHOME"/include/qwt" |
50 |
QWT_INCLUDES=-I$QWTHOME"/include/qwt" |
| 51 |
if test ! -f $QWT_INCLUDES/qwt.h ; then |
51 |
if test ! -f ${QWT_INCLUDES:2}/qwt.h ; then |
| 52 |
QWT_INCLUDES=$QWTHOME"/include" |
52 |
QWT_INCLUDES=-I$QWTHOME"/include" |
| 53 |
fi |
53 |
fi |
| 54 |
if test ! -f $QWT_INCLUDES/qwt.h ; then |
54 |
if test ! -f ${QWT_INCLUDES:2}/qwt.h ; then |
| 55 |
QWT_INCLUDES=/usr/lib/qt3/include/qwt |
55 |
QWT_INCLUDES=-I/usr/lib/qt3/include/qwt |
| 56 |
fi |
56 |
fi |
| 57 |
fi |
57 |
fi |
| 58 |
fi |
58 |
fi |
| 59 |
else |
59 |
else |
| 60 |
if test -z $QWT_INCLUDES; then |
60 |
if test -z $QWT_INCLUDES; then |
| 61 |
QWT_INCLUDES="$QWTHOME/include" |
61 |
QWT_INCLUDES=-I"$QWTHOME/include" |
| 62 |
fi |
62 |
fi |
| 63 |
fi |
63 |
fi |
| 64 |
|
64 |
|
|
Lines 70-76
Link Here
|
| 70 |
AC_LANG_SAVE |
70 |
AC_LANG_SAVE |
| 71 |
AC_LANG_CPLUSPLUS |
71 |
AC_LANG_CPLUSPLUS |
| 72 |
CPPFLAGS_old=$CPPFLAGS |
72 |
CPPFLAGS_old=$CPPFLAGS |
| 73 |
CPPFLAGS="$CPPFLAGS -I$QWT_INCLUDES" |
73 |
CPPFLAGS="$CPPFLAGS $QWT_INCLUDES" |
| 74 |
CPPFLAGS="$CPPFLAGS $QT_INCLUDES" |
74 |
CPPFLAGS="$CPPFLAGS $QT_INCLUDES" |
| 75 |
|
75 |
|
| 76 |
AC_CHECK_HEADER(qwt.h,qwt_ok=yes,qwt_ok=no) |
76 |
AC_CHECK_HEADER(qwt.h,qwt_ok=yes,qwt_ok=no) |
|
Lines 102-108
Link Here
|
| 102 |
fi |
102 |
fi |
| 103 |
|
103 |
|
| 104 |
CXXFLAGS_old=$CXXFLAGS |
104 |
CXXFLAGS_old=$CXXFLAGS |
| 105 |
CXXFLAGS="$CXXFLAGS $QT_INCLUDES -I$QWT_INCLUDES" |
105 |
CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QWT_INCLUDES" |
| 106 |
|
106 |
|
| 107 |
AC_CACHE_VAL(salome_cv_lib_qwt,[ |
107 |
AC_CACHE_VAL(salome_cv_lib_qwt,[ |
| 108 |
AC_TRY_LINK( |
108 |
AC_TRY_LINK( |
|
Lines 123-129
Link Here
|
| 123 |
AC_MSG_RESULT(unable to link with qwt library) |
123 |
AC_MSG_RESULT(unable to link with qwt library) |
| 124 |
AC_MSG_RESULT(QWTHOME environment variable may be wrong) |
124 |
AC_MSG_RESULT(QWTHOME environment variable may be wrong) |
| 125 |
else |
125 |
else |
| 126 |
QWT_INCLUDES="-I$QWT_INCLUDES" |
126 |
#QWT_INCLUDES="-I$QWT_INCLUDES" |
| 127 |
if test "x$QWTHOME" = "x/usr" |
127 |
if test "x$QWTHOME" = "x/usr" |
| 128 |
then |
128 |
then |
| 129 |
QWT_LIBS=" -lqwt" |
129 |
QWT_LIBS=" -lqwt" |
