Prepare version 2.2.9

[tools/install.git] / config_files / qt-x11-free-3.0.5.sh

diff --git a/config_files/qt-x11-free-3.0.5.sh b/config_files/qt-x11-free-3.0.5.sh
index b0d0218a28c089c50b65934b7e4d53b322451529..9c976a9f41929ad18d8a8fa80965fd06bd51251b 100755 (executable)
--- a/config_files/qt-x11-free-3.0.5.sh
+++ b/config_files/qt-x11-free-3.0.5.sh
@@ -4,8 +4,8 @@ check_version(){
 if [ -z "$QTDIR" ]; then
    return 1
 fi
-check_lib_version libqt-mt.so.3.0.5 ${QTDIR}/lib
-if [ "$?" -eq "0" ] ; then
+ver=`grep "QT_VERSION_STR" ${QTDIR}/include/qglobal.h | sed -e 's%^#define QT_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'`
+if [ "$ver" == "3.0.5" ] ; then
     return 0
 fi
 return 1
@@ -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`
@@ -75,7 +84,7 @@ export QTDIR=${PRODUCT_DIR}
 
 QT_FLAGS="-release -thread -shared -qt-gif -platform linux-g++"
 ### use system graphics libraries
-QT_FLAGS=$QT_FLAGS" -system-libpng -system-libjpeg -system-libmng"
+QT_FLAGS=$QT_FLAGS" -system-libpng -system-libjpeg -system-libmng -lpng -lmng -ljpeg"
 ### link also with Mesa if it is previously installed
 if [ -n "$MESA_HOME" ]; then
     QT_FLAGS=$QT_FLAGS" -I${MESA_HOME}/include/GL -L${MESA_HOME}/lib -L/usr/lib -lglide3"