Adding new option of compilation

diff --git a/config_files/PyQt-3.13.sh b/config_files/PyQt-3.13.sh
index 8dae88d587249c63b935cf7b9ce75e7950cd67db..efa950cf08b54cba2026b66375c0223e0cf4cecc 100755 (executable)
--- 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 5f9d313e17886534042582709cae52f73f815abb..56adf35d951d8ad2c374d70412ef43009d372cdf 100755 (executable)
--- 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 dc281b8731cfc9e53ab64ff71490ed74a5adf499..961bcfc022f9e1eb5b0483a5f3596cd8f3b7f050 100755 (executable)
--- 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