Update check products version number procedures

diff --git a/config_files/qt-3.3.3.sh b/config_files/qt-3.3.3.sh
index 47ec930a37be37dfcd8f86d0d7ab5a138e000a7c..7f66f0ea612e30987d44e6c7fcad9f8fd7fd7a40 100755 (executable)
--- a/config_files/qt-3.3.3.sh
+++ b/config_files/qt-3.3.3.sh
@@ -4,8 +4,8 @@ check_version(){
 if [ -z "$QTDIR" ]; then
    return 1
 fi
-check_lib_version libqt-mt.so.3.3.3 ${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.3.3" ] ; then
     return 0
 fi
 return 1

diff --git a/config_files/qt-x11-free-3.0.5.sh b/config_files/qt-x11-free-3.0.5.sh
index 7c5d00f5e174fe328dc51ab9891e2e9a2da5a3ab..17c177d1ab9b709d74fa86437552558a1b72b1a6 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

diff --git a/doc/readme.html b/doc/readme.html
index 227c9866c1d9c7cd68ef64ea104fa5398b1f4bac..fbdec4ba179788b04390c4ae37270e302c264e72 100755 (executable)
--- a/doc/readme.html
+++ b/doc/readme.html
@@ -376,9 +376,9 @@ to use OpenGL drivers installed on your computer locally. This check procedure
       <tr>
         <td>Qt 3.0.5</td>
         <td>existence of QTDIR <br>
-  existence of libqt-mt.so.3.0.5</td>
+  ver=`grep "QT_VERSION_STR" ${QTDIR}/include/qglobal.h | sed -e 's%^#define QT_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'`</td>
         <td>set QTDIR if you have preinstalled version of qt</td>
-        <td>We try to find libqt-mt.so.3.0.5 in ${QTDIR}/lib folder. <br>
+        <td>Qt's qglobal.h file provides version information: ver should be 3.0.5.<br>
   You should set MESA_HOME only if you have preinstalled version of Mesa
 3.4.2.       <br>
   It is recommended to use native Qt on Linux RedHat 8.0</td>