summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2008-09-18 15:33:07 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2008-09-18 15:33:07 (GMT)
commitbf131f3c1ca1c26376435cf32bc870c5380f07db (patch)
tree7511501f01e5830bfa942229065f78542518e1c7
parent0d02dc92d02750a707e77b5ac5bf242a625e264c (diff)
downloadhdf5-bf131f3c1ca1c26376435cf32bc870c5380f07db.zip
hdf5-bf131f3c1ca1c26376435cf32bc870c5380f07db.tar.gz
hdf5-bf131f3c1ca1c26376435cf32bc870c5380f07db.tar.bz2
[svn-r15651] Purpose: Bug Fix
Description: examples/ph5example was being built and tested even in serial mode. Added lines to the examples/Makefile.in to ensure that this is not built and tested unless parallel has been enabled by configure. Tested: kagiso and smirom
-rwxr-xr-xc++/configure2
-rwxr-xr-xconfigure2
-rw-r--r--examples/Makefile.in4
-rwxr-xr-xfortran/configure2
4 files changed, 5 insertions, 5 deletions
diff --git a/c++/configure b/c++/configure
index 8bcd816..4370f9a 100755
--- a/c++/configure
+++ b/c++/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From c++/configure.in Id: configure.in 15596 2008-09-07 20:25:12Z hdftest .
+# From c++/configure.in Id: configure.in 15620 2008-09-14 19:55:08Z hdftest .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for HDF5 C++ 1.6.7-snap19.
#
diff --git a/configure b/configure
index c550092..6aa4190 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Id: configure.in 15596 2008-09-07 20:25:12Z hdftest .
+# From configure.in Id: configure.in 15620 2008-09-14 19:55:08Z hdftest .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for HDF5 1.6.7-snap19.
#
diff --git a/examples/Makefile.in b/examples/Makefile.in
index a81fc43..70f9da7 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -27,7 +27,7 @@ CFLAGS=
## These are the programs that `make all' or `make tests' will build and which
## `make check' will run. List them in the order they should be run.
-TEST_PROGS_PARA=ph5example
+@BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROGS_PARA=ph5example
TEST_PROGS=h5_write h5_read h5_extend_write h5_chunk_read h5_compound \
h5_group h5_select h5_attribute h5_mount h5_reference h5_drivers
TEST_SCRIPTS=testh5cc.sh
@@ -45,7 +45,7 @@ DISTCLEAN=testh5cc.sh
## List all source files here. The list of object files will be
## created by replacing the `.c' with a `.o'. This list is necessary
## for building automatic dependencies.
-TEST_SRC_PARA=ph5example.c
+@BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_SRC_PARA=ph5example.c
TEST_SRC=h5_chunk_read.c h5_compound.c h5_extend_write.c h5_group.c \
h5_read.c h5_write.c h5_select.c h5_attribute.c h5_mount.c \
h5_reference.c h5_drivers.c $(TEST_SRC_PARA)
diff --git a/fortran/configure b/fortran/configure
index 50c34b4..afac027 100755
--- a/fortran/configure
+++ b/fortran/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From fortran/configure.in Id: configure.in 15596 2008-09-07 20:25:12Z hdftest .
+# From fortran/configure.in Id: configure.in 15620 2008-09-14 19:55:08Z hdftest .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for HDF5 Fortran 1.6.7-snap19.
#