diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tools/h5diff/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/h5diff/Makefile.in | 4 |
4 files changed, 5 insertions, 5 deletions
@@ -29431,7 +29431,7 @@ else BUILD_CXX_CONDITIONAL_FALSE= fi - if test -n "$PARALLEL"; then + if test "X$PARALLEL" = "Xyes"; then BUILD_PARALLEL_CONDITIONAL_TRUE= BUILD_PARALLEL_CONDITIONAL_FALSE='#' else diff --git a/configure.ac b/configure.ac index 4bb76d2..92dde46 100644 --- a/configure.ac +++ b/configure.ac @@ -3015,7 +3015,7 @@ LDFLAGS="$saved_user_LDFLAGS" ## need to be compiled AM_CONDITIONAL([BUILD_CXX_CONDITIONAL], [test "X$HDF_CXX" = "Xyes"]) -AM_CONDITIONAL([BUILD_PARALLEL_CONDITIONAL], [test -n "$PARALLEL"]) +AM_CONDITIONAL([BUILD_PARALLEL_CONDITIONAL], [test "X$PARALLEL" = "Xyes"]) AM_CONDITIONAL([BUILD_FORTRAN_CONDITIONAL], [test "X$HDF_FORTRAN" = "Xyes"]) AM_CONDITIONAL([BUILD_HDF5_HL_CONDITIONAL], [test "X$HDF5_HL" = "Xyes"]) AM_CONDITIONAL([BUILD_TESTS_CONDITIONAL], [test "X$HDF5_TESTS" = "Xyes"]) diff --git a/tools/h5diff/Makefile.am b/tools/h5diff/Makefile.am index 13044e5..d9e514b 100644 --- a/tools/h5diff/Makefile.am +++ b/tools/h5diff/Makefile.am @@ -25,7 +25,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib # is enabled. if BUILD_PARALLEL_CONDITIONAL H5PDIFF=ph5diff -if BUILD_TESTS_CONDITIONAL +if BUILD_TESTS_PARALLEL_CONDITIONAL TEST_SCRIPT_PARA=testph5diff.sh else TEST_SCRIPT_PARA= diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 5c7cffa..8886dc5 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -708,8 +708,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 expect_sorted \ # Always build and test h5diff but build and test ph5diff only if parallel # is enabled. @BUILD_PARALLEL_CONDITIONAL_TRUE@H5PDIFF = ph5diff -@BUILD_PARALLEL_CONDITIONAL_TRUE@@BUILD_TESTS_CONDITIONAL_FALSE@TEST_SCRIPT_PARA = -@BUILD_PARALLEL_CONDITIONAL_TRUE@@BUILD_TESTS_CONDITIONAL_TRUE@TEST_SCRIPT_PARA = testph5diff.sh +@BUILD_PARALLEL_CONDITIONAL_TRUE@@BUILD_TESTS_PARALLEL_CONDITIONAL_FALSE@TEST_SCRIPT_PARA = +@BUILD_PARALLEL_CONDITIONAL_TRUE@@BUILD_TESTS_PARALLEL_CONDITIONAL_TRUE@TEST_SCRIPT_PARA = testph5diff.sh # Add h5diff specific linker flags here h5diff_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) |