From: vsr <vsr@opencascade.com>
Date: Fri, 23 Dec 2005 08:49:41 +0000 (+0000)
Subject: Fix problems with native qt caused by latest integrations
X-Git-Tag: V_2_2_7~7
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5e7e3b03ba813b3702bbd907bc3db5aa9aeae489;p=tools%2Finstall.git

Fix problems with native qt caused by latest integrations
---

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`
diff --git a/config_files/qt-x11-free-3.0.5.sh b/config_files/qt-x11-free-3.0.5.sh
index 17c177d..9c976a9 100755
--- a/config_files/qt-x11-free-3.0.5.sh
+++ b/config_files/qt-x11-free-3.0.5.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.0.5 ${LD_LIBRARY_PATH}`"
+qtdir=""
+if [ -d /usr/share/qt3/lib ] ; then
+    qtdir="`find_in_path libqt-mt.so.3.0.5 /usr/share/qt3/lib`"
+fi
+if [ -z "${qtdir}" ] && [ -d /usr/lib/qt3/lib ] ; then
+    qtdir="`find_in_path libqt-mt.so.3.0.5 /usr/lib/qt3/lib`"
+fi
+if [ -z "${qtdir}" ] ; then
+    qtdir="`find_in_path libqt-mt.so.3.0.5 /usr/lib`"
+fi
 if [ -z "${qtdir}" ] ; then
-    qtdir="`find_in_path libqt-mt.so.3.0.5 /usr/lib/qt-3.0.5`"
+    qtdir="`find_in_path libqt-mt.so.3.0.5 ${LD_LIBRARY_PATH}`"
 fi
 if [ -n "${qtdir}" ] ; then
     qtdir=`cd ${qtdir}/..; pwd`