Attachment #141243 for bug #155974

View | Details | Raw Unified | Return to bug 155974 | Differences between

and this patch




  fi
  if test "x$QWTHOME" = "x/usr"
  then
    LIBS="$LIBS -L$QWTHOME/lib -lqwt-salome"
  else
    LIBS="$LIBS -L$QWTHOME/lib -lqwt-salome"
  fi

  CXXFLAGS_old=$CXXFLAGS

    QWT_INCLUDES="-I$QWT_INCLUDES"
    if test "x$QWTHOME" = "x/usr"
    then
      QWT_LIBS="-L$QWTHOME/lib -lqwt-salome"
    else
      QWT_LIBS="-L$QWTHOME/lib -lqwt-salome"
    fi

    AC_SUBST(QWT_INCLUDES)

Return to bug 155974

Lines 96-104 Link Here

(-)GUI_SRC_3.2.6/adm_local/unix/config_files/check_qwt.m4_orig (-4 / +4 lines)
96	fi	96	fi
97	if test "x$QWTHOME" = "x/usr"	97	if test "x$QWTHOME" = "x/usr"
98	then	98	then
99	LIBS="$LIBS -lqwt"	99	LIBS="$LIBS -L$QWTHOME/lib -lqwt-salome"
100	else	100	else
101	LIBS="$LIBS -L$QWTHOME/lib -lqwt"	101	LIBS="$LIBS -L$QWTHOME/lib -lqwt-salome"
102	fi	102	fi
103		103
104	CXXFLAGS_old=$CXXFLAGS	104	CXXFLAGS_old=$CXXFLAGS
Lines 126-134 Link Here
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="-L$QWTHOME/lib -lqwt-salome"
130	else	130	else
131	QWT_LIBS="-L$QWTHOME/lib -lqwt"	131	QWT_LIBS="-L$QWTHOME/lib -lqwt-salome"
132	fi	132	fi
133		133
134	AC_SUBST(QWT_INCLUDES)	134	AC_SUBST(QWT_INCLUDES)