Update

diff --git a/config_files/hdf5-1.8.4.sh b/config_files/hdf5-1.8.4.sh
index d2a8f397819d666c0f2e5a1149300d989722bce5..818eb023340559b55e7776860e00b9dc9f29796b 100755 (executable)
--- a/config_files/hdf5-1.8.4.sh
+++ b/config_files/hdf5-1.8.4.sh
@@ -84,7 +84,12 @@ install_source_and_build()
 install_source
 
 # build sources
-HDF_CONFIGURE_OPTIONS="--disable-debug --enable-production --enable-threadsafe --enable-hdf5v1_4 --enable-stream-vfd --disable-hsizet --with-pthread=/usr/include,/usr/lib"
+HDF_CONFIGURE_OPTIONS="--disable-debug --enable-production --enable-threadsafe --with-pthread=/usr/include,/usr/lib"
+
+if test "$V16_COMPATIBILITY" == "yes" ; then
+  HDF_CONFIGURE_OPTIONS="${HDF_CONFIGURE_OPTIONS} --with-default-api-version=v16"
+fi
+
 if test `uname -m` == "x86_64" ; then
     HDF_CONFIGURE_OPTIONS="${HDF_CONFIGURE_OPTIONS} CFLAGS=-m64 CXXFLAGS=-m64"
 fi

diff --git a/config_files/qt-4.6.2.sh b/config_files/qt-4.6.2.sh
index 54f4258832d97026f510f706cbbfbde04180215a..6ce0b7ef5d224f004298d0aae65f41d9424661a4 100755 (executable)
--- a/config_files/qt-4.6.2.sh
+++ b/config_files/qt-4.6.2.sh
@@ -85,6 +85,20 @@ sed -e "s%\(QLinearGradient gradient(QPoint(\)\(width()/2, 0), QPoint(width()/2,
     examples/xmlpatterns/trafficinfo/mainwindow.cpp > examples/xmlpatterns/trafficinfo/mainwindow.cpp.1
     mv -f examples/xmlpatterns/trafficinfo/mainwindow.cpp.1 examples/xmlpatterns/trafficinfo/mainwindow.cpp
 
+is_mandriva2006=0
+
+if [ -e /etc/issue ] ; then
+  grep -e "Mandriva Linux release 2006.0" /etc/issue > /dev/null
+if [ $? == 0 ] ; then is_mandriva2006=1 ; fi
+fi
+
+if [ $is_mandriva2006 == 1 ] ; then
+    if test `uname -m` = "x86_64" ; then
+    sed -e "s/-O2/-O1/g" mkspecs/common/g++.conf > mkspecs/common/g++.conf.1
+    mv -f mkspecs/common/g++.conf.1 mkspecs/common/g++.conf
+    fi
+fi
+
 # configure
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure -prefix ${PRODUCT_DIR} -no-separate-debug-info -release -opensource -confirm-license