From 77a72ec75fedab99abddb5074a0df9633d6e92e6 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 23 Dec 2005 08:56:31 +0000 Subject: [PATCH] Fix problems with native qt caused by latest integrations --- config_files/qt-3.3.3.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/config_files/qt-3.3.3.sh b/config_files/qt-3.3.3.sh index 675e270..ea8993c 100755 --- a/config_files/qt-3.3.3.sh +++ b/config_files/qt-3.3.3.sh @@ -26,9 +26,18 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" # looks for the native product and collects it's environment (used by make_env()) try_native(){ -qtdir="`find_in_path libqt-mt.so.3.3.3 ${LD_LIBRARY_PATH}`" +qtdir="" +if [ -d /usr/share/qt3/lib ] ; then + qtdir="`find_in_path libqt-mt.so.3.3.3 /usr/share/qt3/lib`" +fi +if [ -z "${qtdir}" ] && [ -d /usr/lib/qt3/lib ] ; then + qtdir="`find_in_path libqt-mt.so.3.3.3 /usr/lib/qt3/lib`" +fi +if [ -z "${qtdir}" ] ; then + qtdir="`find_in_path libqt-mt.so.3.3.3 /usr/lib`" +fi if [ -z "${qtdir}" ] ; then - qtdir="`find_in_path libqt-mt.so.3.3.3 /usr/lib/qt3`" + qtdir="`find_in_path libqt-mt.so.3.3.3 ${LD_LIBRARY_PATH}`" fi if [ -n "${qtdir}" ] ; then qtdir=`cd ${qtdir}/..; pwd` -- 2.39.2