Minor fixes

diff --git a/config_files/hdf5-1.6.9.sh b/config_files/hdf5-1.6.9.sh
index c5c535c0d77e9d086ee51efc46a782b3affd8280..1ed18904d3b365914df3997b210b383f7f72e59d 100755 (executable)
--- 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 <<EOF
 used gcc=$GCC