[svn-r3906] Purpose:

    Bug Fix
Description:
    A parallel example was added to the examples/ subdirectory. This was
    being built whether --enable-parallel was defined or not. This was
    causing some havoc with certain setups.
Solution:
    Added logic to make it so that the parallel examples are made only if
    --enable-parallel is specified.
Platforms tested:
    Linux

3 files changed, 11 insertions, 7 deletions

diff --git a/configure b/configure
index e65e12a..d6a2fdd 100755
--- a/configure
+++ b/configure
@@ -9827,10 +9827,12 @@ touch ./config/stamp1
 saved_no_create=$no_create
 no_create=yes
 
-PARALLEL_MAKE=
+PARALLEL_MAKE=""
+ PARALLEL_EXAMPLES_SRC=""
 
 if test -n "$TESTPARALLEL"; then
    PARALLEL_MAKE="$TESTPARALLEL/Makefile"
+   PARALLEL_EXAMPLES_SRC="examples/ph5example.c"
 fi
 
 EXTRA_H4_MAKEFILES=
@@ -10068,6 +10070,7 @@ s%@COMMENCE@%%g
 s%@CONCLUDE@%%g
 s%@SEARCH@%$SEARCH%g
 s%@SETX@%$SETX%g
+s%@PARALLEL_EXAMPLES_SRC@%$PARALLEL_EXAMPLES_SRC%g
 
 CEOF
 EOF
diff --git a/configure.in b/configure.in
index 9feaa1a..1937629 100644
--- a/configure.in
+++ b/configure.in
@@ -1581,10 +1581,12 @@ touch ./config/stamp1
 saved_no_create=$no_create
 no_create=yes
 
-PARALLEL_MAKE=
+PARALLEL_MAKE=""
+AC_SUBST(PARALLEL_EXAMPLES_SRC) PARALLEL_EXAMPLES_SRC=""
 
 if test -n "$TESTPARALLEL"; then
    PARALLEL_MAKE="$TESTPARALLEL/Makefile"
+   PARALLEL_EXAMPLES_SRC="examples/ph5example.c"
 fi
 
 EXTRA_H4_MAKEFILES=
diff --git a/examples/Makefile.in b/examples/Makefile.in
index b36f86a..1402b48 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -15,9 +15,9 @@ LIBHDF5=../src/libhdf5.la
 
 ## 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= h5_write h5_read h5_extend_write h5_chunk_read h5_compound \
-	h5_group h5_select h5_attribute h5_mount h5_reference \
-	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 $(PARALLEL_EXAMPLES_SRC:.c=)
 
 ## These are the files that `make clean' (and derivatives) will remove from
 ## this directory.
@@ -28,10 +28,9 @@ CLEAN=*.h5
 ## for building automatic dependencies.
 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_reference.c $(PARALLEL_EXAMPLES_SRC)
 TEST_OBJ=$(TEST_SRC:.c=.lo)
 
-
 ## How to build the programs... they all depend on the hdf5 library
 $(TEST_PROGS): $(LIBHDF5)
 h5_chunk_read: h5_chunk_read.lo