Attachment #179628 for bug #155974

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

and this patch




  exist_ok=no	
  if test "x$exist_ok" = "xno"; then
     for d in /usr/local /usr ; do
        AC_CHECK_FILE(${d}/lib${LIB_LOCATION_SUFFIX}/libqwt.so.4,exist_ok=yes,exist_ok=no)
        if test "x$exist_ok" = "xyes"; then
           QWTHOME=$d
           AC_MSG_RESULT(libqwt.so.4 detected in $d/lib)
        fi
     done
  fi
  if test "x$exist_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,^$,.,"`
           exist_ok=yes

    LIBS_old=$LIBS
    LIBS="$LIBS $QT_LIBS"
    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

    else
      AC_MSG_RESULT(yes)
      if test "x$QWTHOME" = "x/usr" ; then
        QWT_LIBS=" -l:libqwt.so.4"
      else
        QWT_LIBS="-L$QWTHOME/lib -l:libqwt.so.4"
      fi
    fi


Return to bug 155974

Lines 49-65 Link Here

(-)src4.1.4.old/GUI_SRC_4.1.4/adm_local/unix/config_files/check_qwt.m4 (-8 / +8 lines)
49	exist_ok=no	49	exist_ok=no
50	if test "x$exist_ok" = "xno"; then	50	if test "x$exist_ok" = "xno"; then
51	for d in /usr/local /usr ; do	51	for d in /usr/local /usr ; do
52	AC_CHECK_FILE(${d}/lib${LIB_LOCATION_SUFFIX}/libqwt.so,exist_ok=yes,exist_ok=no)	52	AC_CHECK_FILE(${d}/lib${LIB_LOCATION_SUFFIX}/libqwt.so.4,exist_ok=yes,exist_ok=no)
53	if test "x$exist_ok" = "xyes"; then	53	if test "x$exist_ok" = "xyes"; then
54	QWTHOME=$d	54	QWTHOME=$d
55	AC_MSG_RESULT(libqwt.so detected in $d/lib)	55	AC_MSG_RESULT(libqwt.so.4 detected in $d/lib)
56	fi	56	fi
57	done	57	done
58	fi	58	fi
59	if test "x$exist_ok" = "xno"; then	59	if test "x$exist_ok" = "xno"; then
60	for d in `echo $LD_LIBRARY_PATH \| sed -e "s/:/ /g"` ; do	60	for d in `echo $LD_LIBRARY_PATH \| sed -e "s/:/ /g"` ; do
61	if test -f $d/libqwt.so ; then	61	if test -f $d/libqwt.so.4 ; then
62	AC_MSG_RESULT(libqwt.so detected in $d)	62	AC_MSG_RESULT(libqwt.so.4 detected in $d)
63	QWTHOME=$d	63	QWTHOME=$d
64	QWTHOME=`echo ${QWTHOME} \| sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`	64	QWTHOME=`echo ${QWTHOME} \| sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
65	exist_ok=yes	65	exist_ok=yes
Lines 113-121 Link Here
113	LIBS_old=$LIBS	113	LIBS_old=$LIBS
114	LIBS="$LIBS $QT_LIBS"	114	LIBS="$LIBS $QT_LIBS"
115	if test "x$QWTHOME" = "x/usr" ; then	115	if test "x$QWTHOME" = "x/usr" ; then
116	LIBS="$LIBS -lqwt"	116	LIBS="$LIBS -l:libqwt.so.4"
117	else	117	else
118	LIBS="$LIBS -L$QWTHOME/lib -lqwt"	118	LIBS="$LIBS -L$QWTHOME/lib -l:libqwt.so.4"
119	fi	119	fi
120		120
121	CXXFLAGS_old=$CXXFLAGS	121	CXXFLAGS_old=$CXXFLAGS
Lines 141-149 Link Here
141	else	141	else
142	AC_MSG_RESULT(yes)	142	AC_MSG_RESULT(yes)
143	if test "x$QWTHOME" = "x/usr" ; then	143	if test "x$QWTHOME" = "x/usr" ; then
144	QWT_LIBS=" -lqwt"	144	QWT_LIBS=" -l:libqwt.so.4"
145	else	145	else
146	QWT_LIBS="-L$QWTHOME/lib -lqwt"	146	QWT_LIBS="-L$QWTHOME/lib -l:libqwt.so.4"
147	fi	147	fi
148	fi	148	fi
149		149