[svn-r10475] Purpose:

Feature - conditional compilation

Description:
SRB file driver and tests are now compiled only when SRB is enabled
(using --with-srb during configure).

Solution:
Added an automake conditional in configure.in, altered Makefiles.am in
src and test directories to depend on that conditional.
This should make a nice example for posterity to add conditionally
compiled sources.

Platforms tested:
heping (only configure change)

2 files changed, 20 insertions, 8 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index a7db7d9..7935a39 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -26,14 +26,19 @@ INCLUDES=-I$(top_srcdir)/src -I$(top_builddir)/src
 TEST_SCRIPT = $(top_srcdir)/test/testerror.sh
 check_SCRIPTS = $(TEST_SCRIPT)
 
+# Build and run SRB tests only if SRB driver is enabled.
+if BUILD_SRB_CONDITIONAL
+   SRB_TESTS=srb_write srb_append srb_read
+endif
+
 # These are our main targets. They should be listed in the order to be
 # executed, generally most specific tests to least specific tests.
 TEST_PROG=testhdf5 lheap ohdr stab gheap cache hyperslab istore bittests     \
            dtypes dsets cmpd_dset extend external links unlink big mtime     \
            fillval mount flush1 flush2 enum \
-           set_extent srb_write srb_append srb_read ttsafe stream_test       \
+           set_extent ttsafe stream_test       \
            getname file_handle ntypes dangle dtransform filename reserved    \
-           btree2 blocktrack
+           btree2 blocktrack $(SRB_TESTS)
 
 # List programs to be built when testing here. error_test and err_compat are
 # built at the same time as the other tests, but executed by testerror.sh.
diff --git a/test/Makefile.in b/test/Makefile.in
index 5ca7593..08975d3 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -56,7 +56,7 @@ host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/config/commence.am \
 	$(top_srcdir)/config/conclude.am
-check_PROGRAMS = $(am__EXEEXT_1) error_test$(EXEEXT) \
+check_PROGRAMS = $(am__EXEEXT_2) error_test$(EXEEXT) \
 	err_compat$(EXEEXT) testmeta$(EXEEXT)
 subdir = test
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -70,18 +70,20 @@ am__DEPENDENCIES_1 = $(top_builddir)/src/libhdf5.la
 libh5test_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_libh5test_la_OBJECTS = h5test.lo testframe.lo
 libh5test_la_OBJECTS = $(am_libh5test_la_OBJECTS)
-am__EXEEXT_1 = testhdf5$(EXEEXT) lheap$(EXEEXT) ohdr$(EXEEXT) \
+@BUILD_SRB_CONDITIONAL_TRUE@am__EXEEXT_1 = srb_write$(EXEEXT) \
+@BUILD_SRB_CONDITIONAL_TRUE@	srb_append$(EXEEXT) \
+@BUILD_SRB_CONDITIONAL_TRUE@	srb_read$(EXEEXT)
+am__EXEEXT_2 = testhdf5$(EXEEXT) lheap$(EXEEXT) ohdr$(EXEEXT) \
 	stab$(EXEEXT) gheap$(EXEEXT) cache$(EXEEXT) hyperslab$(EXEEXT) \
 	istore$(EXEEXT) bittests$(EXEEXT) dtypes$(EXEEXT) \
 	dsets$(EXEEXT) cmpd_dset$(EXEEXT) extend$(EXEEXT) \
 	external$(EXEEXT) links$(EXEEXT) unlink$(EXEEXT) big$(EXEEXT) \
 	mtime$(EXEEXT) fillval$(EXEEXT) mount$(EXEEXT) flush1$(EXEEXT) \
 	flush2$(EXEEXT) enum$(EXEEXT) set_extent$(EXEEXT) \
-	srb_write$(EXEEXT) srb_append$(EXEEXT) srb_read$(EXEEXT) \
 	ttsafe$(EXEEXT) stream_test$(EXEEXT) getname$(EXEEXT) \
 	file_handle$(EXEEXT) ntypes$(EXEEXT) dangle$(EXEEXT) \
 	dtransform$(EXEEXT) filename$(EXEEXT) reserved$(EXEEXT) \
-	btree2$(EXEEXT) blocktrack$(EXEEXT)
+	btree2$(EXEEXT) blocktrack$(EXEEXT) $(am__EXEEXT_1)
 big_SOURCES = big.c
 big_OBJECTS = big.$(OBJEXT)
 big_LDADD = $(LDADD)
@@ -311,6 +313,8 @@ BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
 BUILD_PDB2HDF = @BUILD_PDB2HDF@
 BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
 BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
+BUILD_SRB_CONDITIONAL_FALSE = @BUILD_SRB_CONDITIONAL_FALSE@
+BUILD_SRB_CONDITIONAL_TRUE = @BUILD_SRB_CONDITIONAL_TRUE@
 BYTESEX = @BYTESEX@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -483,14 +487,17 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src
 TEST_SCRIPT = $(top_srcdir)/test/testerror.sh
 check_SCRIPTS = $(TEST_SCRIPT)
 
+# Build and run SRB tests only if SRB driver is enabled.
+@BUILD_SRB_CONDITIONAL_TRUE@SRB_TESTS = srb_write srb_append srb_read
+
 # These are our main targets. They should be listed in the order to be
 # executed, generally most specific tests to least specific tests.
 TEST_PROG = testhdf5 lheap ohdr stab gheap cache hyperslab istore bittests     \
            dtypes dsets cmpd_dset extend external links unlink big mtime     \
            fillval mount flush1 flush2 enum \
-           set_extent srb_write srb_append srb_read ttsafe stream_test       \
+           set_extent ttsafe stream_test       \
            getname file_handle ntypes dangle dtransform filename reserved    \
-           btree2 blocktrack
+           btree2 blocktrack $(SRB_TESTS)
 
 
 # The libh5test.a library provides common support code for the tests.