From: maintenance team <salome-mnt@opencascade.com>
Date: Fri, 23 Jun 2006 12:47:19 +0000 (+0000)
Subject: Adding new option of compilation
X-Git-Tag: V_3_2_2~21
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c14ae415e4880d72f6895f7e84cc736cba6209f4;p=tools%2Finstall.git

Adding new option of compilation
---

diff --git a/config_files/PyQt-3.13.sh b/config_files/PyQt-3.13.sh
index 8dae88d..efa950c 100755
--- a/config_files/PyQt-3.13.sh
+++ b/config_files/PyQt-3.13.sh
@@ -116,18 +116,7 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-package=PyQt-3.13.tar.gz
-npackage=PyQt-3.13-native.tar.gz
-if [ -n "${QTDIR}" ] ; then
-    dir=`cd ${QTDIR}/.. ; pwd`
-    if [ "${dir}" == "/usr/lib" ] || [ "${dir}" == "/usr/share" ] ; then
-	if [ -f ${SOURCE_DIR}/${npackage} ] ; then
-	    package=${npackage}
-	fi
-    fi
-fi
-
-check_jb tar xfz ${SOURCE_DIR}/${package} -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/PyQt-3.13.tar.gz -C ${INSTALL_ROOT}
 
 # modify pyqtconfig.py file
 cd ${PRODUCT_DIR}
diff --git a/config_files/PyQt-3.14.1.sh b/config_files/PyQt-3.14.1.sh
index 5f9d313..56adf35 100755
--- a/config_files/PyQt-3.14.1.sh
+++ b/config_files/PyQt-3.14.1.sh
@@ -116,18 +116,7 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-package=PyQt-3.14.1.tar.gz
-npackage=PyQt-3.14.1-native.tar.gz
-if [ -n "${QTDIR}" ] ; then
-    dir=`cd ${QTDIR}/.. ; pwd`
-    if [ "${dir}" == "/usr/lib" ] || [ "${dir}" == "/usr/share" ] ; then
-	if [ -f ${SOURCE_DIR}/${npackage} ] ; then
-	    package=${npackage}
-	fi
-    fi
-fi
-
-check_jb tar xfz ${SOURCE_DIR}/${package} -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/PyQt-3.14.1.tar.gz -C ${INSTALL_ROOT}
 
 # modify pyqtconfig.py file
 cd ${PRODUCT_DIR}
diff --git a/config_files/qt-3.3.4.sh b/config_files/qt-3.3.4.sh
index dc281b8..961bcfc 100755
--- a/config_files/qt-3.3.4.sh
+++ b/config_files/qt-3.3.4.sh
@@ -90,6 +90,13 @@ QT_FLAGS="-release -thread -shared -qt-gif -platform linux-g++"
 QT_FLAGS=$QT_FLAGS" -system-libjpeg -system-libpng -system-libmng -qt-imgfmt-jpeg -qt-imgfmt-png -qt-imgfmt-mng -lpng -lmng -ljpeg"
 # prefix
 
+if [ -e /etc/mandriva-release ] ; then
+    version=`cat /etc/mandriva-release | awk '{print $1$4}'`
+    if [ "$version" == "Mandriva2006.0" ] ; then
+    QT_FLAGS=$QT_FLAGS" -plugin-style-cde -plugin-style-compact -plugin-style-motif -plugin-style-motifplus -plugin-style-platinum -plugin-style-sgi"
+    fi
+fi
+
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure $QT_FLAGS -prefix ${PRODUCT_DIR}
 
 sed -e "s%^all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples%all: symlinks src-qmake src-moc sub-src sub-tools%g" Makefile > _Makefile