From d6c59b37c3f5bdebbc2ec942f86d8da14b790dbd Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 9 Jun 2005 12:58:32 +0000 Subject: [PATCH] Update check products version number procedures --- config_files/qt-3.3.3.sh | 4 ++-- config_files/qt-x11-free-3.0.5.sh | 4 ++-- doc/readme.html | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config_files/qt-3.3.3.sh b/config_files/qt-3.3.3.sh index 47ec930..7f66f0e 100755 --- 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 7c5d00f..17c177d 100755 --- 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 227c986..fbdec4b 100755 --- a/doc/readme.html +++ b/doc/readme.html @@ -376,9 +376,9 @@ to use OpenGL drivers installed on your computer locally. This check procedure Qt 3.0.5 existence of QTDIR
- existence of libqt-mt.so.3.0.5 + ver=`grep "QT_VERSION_STR" ${QTDIR}/include/qglobal.h | sed -e 's%^#define QT_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'` set QTDIR if you have preinstalled version of qt - We try to find libqt-mt.so.3.0.5 in ${QTDIR}/lib folder.
+ Qt's qglobal.h file provides version information: ver should be 3.0.5.
You should set MESA_HOME only if you have preinstalled version of Mesa 3.4.2.
It is recommended to use native Qt on Linux RedHat 8.0 -- 2.39.2