From: vsr Date: Tue, 20 Oct 2009 19:41:39 +0000 (+0000) Subject: Minor fixes X-Git-Tag: V5_1_3~28 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bd918354fe8801fcea6ba5f5ab4146756bd5c733;p=tools%2Finstall.git Minor fixes --- diff --git a/config_files/hdf5-1.6.9.sh b/config_files/hdf5-1.6.9.sh index c5c535c..1ed1890 100755 --- a/config_files/hdf5-1.6.9.sh +++ b/config_files/hdf5-1.6.9.sh @@ -84,16 +84,14 @@ install_source_and_build() install_source # build sources -if test `uname -m` = "x86_64" ; then -HDF_CONFIGURE_OPTIONS="-disable-debug --enable-production --enable-threadsafe --enable-hdf5v1_2 --enable-stream-vfd --disable-hsizet --with-pthread=/usr/include,/usr/lib CFLAGS=-m64 CXXFLAGS=-m64" -else -HDF_CONFIGURE_OPTIONS="-disable-debug --enable-production --enable-threadsafe --enable-hdf5v1_2 --enable-stream-vfd --disable-hsizet --with-pthread=/usr/include,/usr/lib" +HDF_CONFIGURE_OPTIONS="--disable-debug --enable-production --enable-threadsafe --enable-hdf5v1_2 --enable-stream-vfd --disable-hsizet --with-pthread=/usr/include,/usr/lib" +if test `uname -m` == "x86_64" ; then + HDF_CONFIGURE_OPTIONS="${HDF_CONFIGURE_OPTIONS} CFLAGS=-m64 CXXFLAGS=-m64" fi cd ${PRODUCT_SRC_DIR} test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} -check_job ${PRODUCT_DIR}/CONFIGURE.LOG \ - ./configure --prefix=${PRODUCT_DIR} $HDF_CONFIGURE_OPTIONS +check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix=${PRODUCT_DIR} $HDF_CONFIGURE_OPTIONS GCC=`which gcc` cat >> ${PRODUCT_DIR}/MAKE.LOG <