[svn-r15042] Bug fix.

Description:
The fortran Makefile.am used HDF_FORTRAN to indicate it is part of the
Fortran API source so that conclude.am will give fortran api prefix in the
test output.  The symbox HDF_FORTRAN is also used in configure for a different
purpose (indicated --enable-fortran). They conflicted.
Similar problem for the symbol HDF_CXX.

Solution:
Changed all the involved Makefile.am to use "FORTRAN_API" instead. It is
a more appropriate name.  Same for CXX_API.

Along the way, discovered that the Makefile.am of hl/fortran/test and
hl/cxx/test did not have those symbols at all.  Added them in.

Platform tested:
Kagiso serial and h5committested (kagisopp, smirom, linew).

9 files changed, 41 insertions, 37 deletions

diff --git a/fortran/Makefile.in b/fortran/Makefile.in
index c90063a..55af15a 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -779,10 +779,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
-	      if test "X$(HDF_FORTRAN)" = "Xyes"; then \
+	      if test "X$(FORTRAN_API)" = "Xyes"; then \
 	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
 	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(HDF_CXX)" = "Xyes"; then \
+	      elif test "X$(CXX_API)" = "Xyes"; then \
 	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
 	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
 	      else \
@@ -818,10 +818,10 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
-	      if test "X$(HDF_FORTRAN)" = "Xyes"; then \
+	      if test "X$(FORTRAN_API)" = "Xyes"; then \
 	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
 	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(HDF_CXX)" = "Xyes"; then \
+	      elif test "X$(CXX_API)" = "Xyes"; then \
 	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
 	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
 	      else \
diff --git a/fortran/examples/Makefile.am b/fortran/examples/Makefile.am
index 9ac7bc9..772cb13 100644
--- a/fortran/examples/Makefile.am
+++ b/fortran/examples/Makefile.am
@@ -43,7 +43,7 @@ INSTALL_FILES=dsetexample.f90 fileexample.f90 rwdsetexample.f90             \
        refregexample.f90 mountexample.f90 compound.f90 ph5example.f90
 
 # Mark this directory as part of the Fortran API
-HDF_FORTRAN=yes
+FORTRAN_API=yes
 
 # Some examples depend on files created by other examples.
 grpdsetexample.chkexe_: grpsexample.chkexe_
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index d806d9f..eafb90a 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -140,9 +140,7 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
 HDF_CXX = @HDF_CXX@
-
-# Mark this directory as part of the Fortran API
-HDF_FORTRAN = yes
+HDF_FORTRAN = @HDF_FORTRAN@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
@@ -339,6 +337,9 @@ INSTALL_FILES = dsetexample.f90 fileexample.f90 rwdsetexample.f90             \
        refregexample.f90 mountexample.f90 compound.f90 ph5example.f90
 
 
+# Mark this directory as part of the Fortran API
+FORTRAN_API = yes
+
 # Tell automake how to install examples
 EXAMPLEDIR = $(docdir)/hdf5/examples/fortran
 
@@ -711,10 +712,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
-	      if test "X$(HDF_FORTRAN)" = "Xyes"; then \
+	      if test "X$(FORTRAN_API)" = "Xyes"; then \
 	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
 	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(HDF_CXX)" = "Xyes"; then \
+	      elif test "X$(CXX_API)" = "Xyes"; then \
 	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
 	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
 	      else \
@@ -750,10 +751,10 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
-	      if test "X$(HDF_FORTRAN)" = "Xyes"; then \
+	      if test "X$(FORTRAN_API)" = "Xyes"; then \
 	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
 	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(HDF_CXX)" = "Xyes"; then \
+	      elif test "X$(CXX_API)" = "Xyes"; then \
 	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
 	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
 	      else \
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am
index 4216f34..47caf20 100644
--- a/fortran/src/Makefile.am
+++ b/fortran/src/Makefile.am
@@ -149,7 +149,7 @@ H5fortran_detect.f90: H5test_kind$(EXEEXT)
 H5test_kind_SOURCES = $(srcdir)/H5test_kind.f90
 
 # Mark this directory as part of the Fortran API
-HDF_FORTRAN=yes
+FORTRAN_API=yes
 
 # Hardcode the dependencies of these files. There isn't a known way of
 # determining this automagically (like we do with the C files). So, when
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index a23b608..d717520 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -204,9 +204,7 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
 HDF_CXX = @HDF_CXX@
-
-# Mark this directory as part of the Fortran API
-HDF_FORTRAN = yes
+HDF_FORTRAN = @HDF_FORTRAN@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
@@ -443,6 +441,9 @@ H5fortran_detect_SOURCES = H5fortran_detect.f90
 # how to compile a fortran program given its sources.
 H5test_kind_SOURCES = $(srcdir)/H5test_kind.f90
 
+# Mark this directory as part of the Fortran API
+FORTRAN_API = yes
+
 # Automake needs to be taught how to build lib, progs, and tests targets.
 # These will be filled in automatically for the most part (e.g.,
 # lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
@@ -992,10 +993,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
-	      if test "X$(HDF_FORTRAN)" = "Xyes"; then \
+	      if test "X$(FORTRAN_API)" = "Xyes"; then \
 	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
 	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(HDF_CXX)" = "Xyes"; then \
+	      elif test "X$(CXX_API)" = "Xyes"; then \
 	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
 	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
 	      else \
@@ -1031,10 +1032,10 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
-	      if test "X$(HDF_FORTRAN)" = "Xyes"; then \
+	      if test "X$(FORTRAN_API)" = "Xyes"; then \
 	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
 	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(HDF_CXX)" = "Xyes"; then \
+	      elif test "X$(CXX_API)" = "Xyes"; then \
 	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
 	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
 	      else \
diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am
index 24f9d61..7d619d9 100644
--- a/fortran/test/Makefile.am
+++ b/fortran/test/Makefile.am
@@ -65,7 +65,7 @@ MOSTLYCLEANFILES=*.tmp
 
 # Mark this directory as part of the Fortran API (this affects output
 # from tests in conclude.am)
-HDF_FORTRAN=yes
+FORTRAN_API=yes
 
 # fflush2 depends on files created by fflush1
 fflush2.chkexe_: fflush1.chkexe_
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index de0e94e..43f713b 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -202,10 +202,7 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
 HDF_CXX = @HDF_CXX@
-
-# Mark this directory as part of the Fortran API (this affects output
-# from tests in conclude.am)
-HDF_FORTRAN = yes
+HDF_FORTRAN = @HDF_FORTRAN@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
@@ -417,6 +414,10 @@ fflush2_SOURCES = fflush2.f90
 LDADD = libh5test_fortran.la $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)
 MOSTLYCLEANFILES = *.tmp
 
+# Mark this directory as part of the Fortran API (this affects output
+# from tests in conclude.am)
+FORTRAN_API = yes
+
 # Automake needs to be taught how to build lib, progs, and tests targets.
 # These will be filled in automatically for the most part (e.g.,
 # lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
@@ -906,10 +907,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
-	      if test "X$(HDF_FORTRAN)" = "Xyes"; then \
+	      if test "X$(FORTRAN_API)" = "Xyes"; then \
 	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
 	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(HDF_CXX)" = "Xyes"; then \
+	      elif test "X$(CXX_API)" = "Xyes"; then \
 	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
 	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
 	      else \
@@ -945,10 +946,10 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
-	      if test "X$(HDF_FORTRAN)" = "Xyes"; then \
+	      if test "X$(FORTRAN_API)" = "Xyes"; then \
 	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
 	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(HDF_CXX)" = "Xyes"; then \
+	      elif test "X$(CXX_API)" = "Xyes"; then \
 	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
 	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
 	      else \
diff --git a/fortran/testpar/Makefile.am b/fortran/testpar/Makefile.am
index 7250653..9f9fc43 100644
--- a/fortran/testpar/Makefile.am
+++ b/fortran/testpar/Makefile.am
@@ -47,6 +47,6 @@ parallel_test_SOURCES=ptest.f90 hyper.f90 mdset.f90
 LDADD=$(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)
 
 # Mark this directory as part of the Fortran API
-HDF_FORTRAN=yes
+FORTRAN_API=yes
 
 include $(top_srcdir)/config/conclude.am
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index 2851c6b..ca7ef59 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -153,9 +153,7 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
 HDF5_HL = @HDF5_HL@
 HDF5_INTERFACES = @HDF5_INTERFACES@
 HDF_CXX = @HDF_CXX@
-
-# Mark this directory as part of the Fortran API
-HDF_FORTRAN = yes
+HDF_FORTRAN = @HDF_FORTRAN@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
@@ -352,6 +350,9 @@ parallel_test_SOURCES = ptest.f90 hyper.f90 mdset.f90
 # The tests depend on several libraries.
 LDADD = $(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)
 
+# Mark this directory as part of the Fortran API
+FORTRAN_API = yes
+
 # Automake needs to be taught how to build lib, progs, and tests targets.
 # These will be filled in automatically for the most part (e.g.,
 # lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
@@ -708,10 +709,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
-	      if test "X$(HDF_FORTRAN)" = "Xyes"; then \
+	      if test "X$(FORTRAN_API)" = "Xyes"; then \
 	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
 	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(HDF_CXX)" = "Xyes"; then \
+	      elif test "X$(CXX_API)" = "Xyes"; then \
 	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
 	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
 	      else \
@@ -747,10 +748,10 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
-	      if test "X$(HDF_FORTRAN)" = "Xyes"; then \
+	      if test "X$(FORTRAN_API)" = "Xyes"; then \
 	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
 	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(HDF_CXX)" = "Xyes"; then \
+	      elif test "X$(CXX_API)" = "Xyes"; then \
 	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
 	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
 	      else \