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 675e27017d12443fed1a80f471ae3b7f1a6b2f60..ea8993cc063bc5b85b1a7406cfe0dc08035f0dc5 100755 (executable)
--- 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 17c177d1ab9b709d74fa86437552558a1b72b1a6..9c976a9f41929ad18d8a8fa80965fd06bd51251b 100755 (executable)
--- 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`