Attachment #144086 for bug #155974

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

and this patch




  exits_ok=no	
  if test "x$exits_ok" = "xno"; then
     for d in /usr/local /usr ; do
        AC_CHECK_FILE(${d}/lib${LIB_LOCATION_SUFFIX}/libqwt.so.4,exits_ok=yes,exits_ok=no)
        if test "x$exits_ok" = "xyes"; then
           QWTHOME=$d
           AC_MSG_RESULT(libqwt.so.4 detected in $d/lib)
        fi
     done
  fi
  if test "x$exits_ok" = "xno"; then
     for d in `echo $LD_LIBRARY_PATH | sed -e "s/:/ /g"` ; do
        if test -f $d/libqwt.so.4 ; then
           AC_MSG_RESULT(libqwt.so.4 detected in $d)
           QWTHOME=$d
           QWTHOME=`echo ${QWTHOME} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
           exits_ok=yes




  fi
  if test "x$QWTHOME" = "x/usr"
  then
    LIBS="$LIBS -l:libqwt.so.4"
  else
    LIBS="$LIBS -L$QWTHOME/lib -l:libqwt.so.4"
  fi

  CXXFLAGS_old=$CXXFLAGS

    QWT_INCLUDES="-I$QWT_INCLUDES"
    if test "x$QWTHOME" = "x/usr"
    then
      QWT_LIBS=" -l:libqwt.so.4"
    else
      QWT_LIBS=" -L$QWTHOME/lib -l:libqwt.so.4"
    fi

    AC_SUBST(QWT_INCLUDES)

Return to bug 155974

Lines 27-43 Link Here

(-)GUI_SRC_3.2.6/adm_local/unix/config_files/check_qwt.m4.org (-4 / +4 lines)
27	exits_ok=no	27	exits_ok=no
28	if test "x$exits_ok" = "xno"; then	28	if test "x$exits_ok" = "xno"; then
29	for d in /usr/local /usr ; do	29	for d in /usr/local /usr ; do
30	AC_CHECK_FILE(${d}/lib${LIB_LOCATION_SUFFIX}/libqwt.so,exits_ok=yes,exits_ok=no)	30	AC_CHECK_FILE(${d}/lib${LIB_LOCATION_SUFFIX}/libqwt.so.4,exits_ok=yes,exits_ok=no)
31	if test "x$exits_ok" = "xyes"; then	31	if test "x$exits_ok" = "xyes"; then
32	QWTHOME=$d	32	QWTHOME=$d
33	AC_MSG_RESULT(libqwt.so detected in $d/lib)	33	AC_MSG_RESULT(libqwt.so.4 detected in $d/lib)
34	fi	34	fi
35	done	35	done
36	fi	36	fi
37	if test "x$exits_ok" = "xno"; then	37	if test "x$exits_ok" = "xno"; then
38	for d in `echo $LD_LIBRARY_PATH \| sed -e "s/:/ /g"` ; do	38	for d in `echo $LD_LIBRARY_PATH \| sed -e "s/:/ /g"` ; do
39	if test -f $d/libqwt.so ; then	39	if test -f $d/libqwt.so.4 ; then
40	AC_MSG_RESULT(libqwt.so detected in $d)	40	AC_MSG_RESULT(libqwt.so.4 detected in $d)
41	QWTHOME=$d	41	QWTHOME=$d
42	QWTHOME=`echo ${QWTHOME} \| sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`	42	QWTHOME=`echo ${QWTHOME} \| sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
43	exits_ok=yes	43	exits_ok=yes

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:libqwt.so.4"
100	else	100	else
101	LIBS="$LIBS -L$QWTHOME/lib -lqwt"	101	LIBS="$LIBS -L$QWTHOME/lib -l:libqwt.so.4"
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:libqwt.so.4"
130	else	130	else
131	QWT_LIBS="-L$QWTHOME/lib -lqwt"	131	QWT_LIBS=" -L$QWTHOME/lib -l:libqwt.so.4"
132	fi	132	fi
133		133
134	AC_SUBST(QWT_INCLUDES)	134	AC_SUBST(QWT_INCLUDES)