diff options
author | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2003-10-06 08:39:57 +0000 |
---|---|---|
committer | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2003-10-06 08:39:57 +0000 |
commit | 1cd0b2f32b7f6fd796b82ed569057a476abfebe2 (patch) | |
tree | 693092a72246136b99d701d34e78010dfcabfbea /lib | |
parent | 980c8870d272e7e185cacca1e7ebe565f81b2550 (diff) |
Fixed a small shell syntax error in an if statement.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@3417 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib')
-rwxr-xr-x | lib/make/extras/HDF5/setup.sh | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/lib/make/extras/HDF5/setup.sh b/lib/make/extras/HDF5/setup.sh index 539027b2..5c552a84 100755 --- a/lib/make/extras/HDF5/setup.sh +++ b/lib/make/extras/HDF5/setup.sh @@ -10,16 +10,16 @@ choose_hdf5=`echo $HDF5 | tr '[:upper:]' '[:lower:]'` -if test "X$choose_hdf5" = "Xyes" ; then +if [ "X$choose_hdf5" = 'Xyes' ]; then echo 'Configuring with HDF5.' # Work out which variation of HDF5 lib -if [ -z "$HDF5_DIR" ] ; then +if [ -z "$HDF5_DIR" ]; then echo ' HDF5 selected but no HDF5_DIR set. Checking some places...' CCTK_Search HDF5_DIR '/usr /usr/local /usr/local/hdf5 /usr/local/packages/hdf5 /usr/local/apps/hdf5 /usr/local/hdf5/serial c:/packages/hdf5' include/hdf5.h - if [ -z "$HDF5_DIR" ] ; then + if [ -z "$HDF5_DIR" ]; then echo ' Unable to locate the HDF5 directory - please set HDF5_DIR' exit 2 fi @@ -34,14 +34,14 @@ fi grep -qe '#define H5_HAVE_PARALLEL 1' ${HDF5_DIR}/include/H5pubconf.h 2> /dev/null test_phdf5=$? -if [ -n "$MPI" ] ; then - if [ $test_phdf5 -eq 0 ] ; then +if [ -n "$MPI" ]; then + if [ $test_phdf5 -eq 0 ]; then echo ' Found parallel HDF5 library, so Cactus will potentially make use of parallel HDF5 support.' # else # echo ' Found serial HDF5 library, so Cactus can't make use of parallel HDF5 support.' fi else - if [ $test_phdf5 -eq 0 ] ; then + if [ $test_phdf5 -eq 0 ]; then echo " Found parallel HDF5 library, but Cactus wasn't configured with MPI." echo ' Please set HDF5_DIR to point to a serial HDF5 package, or configure Cactus with MPI.' exit 2 @@ -58,18 +58,18 @@ HDF5_INC_DIRS="$HDF5_DIR/include" # check that we have the right version of HDF5 under 32/64 bit IRIX # This should better be checked by some autoconf script. -if test -n "$IRIX_BITS"; then - if test -r "$HDF5_LIB_DIRS/libhdf5.a"; then +if [ -n "$IRIX_BITS" ]; then + if [ -r "$HDF5_LIB_DIRS/libhdf5.a" ]; then hdf5_lib="$HDF5_LIB_DIRS/libhdf5.a" - elif test -r "$HDF5_LIB_DIRS/libhdf5.so"; then + elif [ -r "$HDF5_LIB_DIRS/libhdf5.so" ]; then hdf5_lib="$HDF5_LIB_DIRS/libhdf5.so" else hdf5_lib= fi - if test -n $hdf5_lib; then + if [ -n "$hdf5_lib" ]; then file $hdf5_lib | grep -qe $IRIX_BITS 2> /dev/null - if test $? -ne 0; then + if [ $? -ne 0 ]; then echo " The HDF5 library found in \"$HDF5_LIB_DIRS\" was not compiled as $IRIX_BITS bits !" echo ' Please reconfigure Cactus with the correct setting for HDF5_DIR !' exit 1 @@ -84,7 +84,7 @@ grep -qe '#define H5_HAVE_LIBZ 1' ${HDF5_DIR}/include/H5pubconf.h 2> /dev/null test_zlib=$? # this is for old versions of HDF5 (before 1.4.x) -if [ $test_zlib -ne 0 ] ; then +if [ $test_zlib -ne 0 ]; then grep -qe '#define HAVE_LIBZ 1' ${HDF5_DIR}/include/H5config.h 2> /dev/null test_zlib=$? fi @@ -93,22 +93,22 @@ fi $PERL -we 'exit (`uname` =~ /^CYGWIN/)' is_windows=$? -if [ $test_zlib -eq 0 ] ; then - if [ $is_windows -eq 0 ] ; then +if [ $test_zlib -eq 0 ]; then + if [ $is_windows -eq 0 ]; then libz='libz.a' else libz='zlib.lib' fi - if [ -z "$LIBZ_DIR" -a ! -r /usr/lib/$libz ] ; then + if [ -z "$LIBZ_DIR" -a ! -r /usr/lib/$libz ]; then echo " HDF5 library was compiled with compression library, searching for $libz ..." CCTK_Search LIBZ_DIR '/usr/local/lib c:/packages/libz/lib c:/packages/hdf5/lib' $libz - if [ -z "$LIBZ_DIR" ] ; then + if [ -z "$LIBZ_DIR" ]; then echo " Unable to locate the library $libz - please set LIBZ_DIR" exit 2 fi echo " Found library $libz in $LIBZ_DIR" fi - if [ $is_windows -eq 0 ] ; then + if [ $is_windows -eq 0 ]; then HDF5_LIBS="$HDF5_LIBS z" else HDF5_LIBS="$HDF5_LIBS zlib" @@ -117,7 +117,7 @@ if [ $test_zlib -eq 0 ] ; then fi # Finally, add the math lib which might not be linked against by default -if [ $is_windows -eq 0 ] ; then +if [ $is_windows -eq 0 ]; then HDF5_LIBS="$HDF5_LIBS m" fi @@ -135,7 +135,7 @@ CCTK_WriteLine make.extra.defn 'LIBS += $(HDF5_LIBS)' CCTK_WriteLine make.extra.defn 'LIBDIRS += $(HDF5_LIB_DIRS)' CCTK_WriteLine make.extra.defn 'SYS_INC_DIRS += $(HDF5_INC_DIRS)' -elif test "X$choose_hdf5" != "Xno" -a "X$choose_hdf5" != "X"; then +elif [ "X$choose_hdf5" != "Xno" -a "X$choose_hdf5" != "X" ]; then echo " Don't understand the setting \"HDF5=$HDF5\" !" echo ' Please set it to either "yes" or "no", or leave it blank (same as "no") !' |