1 files changed, 25 insertions, 8 deletions

diff --git a/fortran/examples/Makefile.am b/fortran/examples/Makefile.am
index 57a8f94..d767490 100644
--- a/fortran/examples/Makefile.am
+++ b/fortran/examples/Makefile.am
@@ -31,17 +31,28 @@ endif
 # be run.
 # We don't tell automake about these programs so that it doesn't try to
 # compile them with the regular fortran compiler.
-TEST_PROG=dsetexample fileexample rwdsetexample attrexample groupexample    \
-       grpsexample grpdsetexample hyperslab selectele grpit refobjexample   \
-       refregexample mountexample compound
-TEST_SCRIPT=testh5fc.sh
+
+TEST_PROG=dsetexample fileexample rwdsetexample attrexample groupexample \
+     grpsexample grpdsetexample hyperslab selectele grpit refobjexample  \
+     refregexample mountexample compound
 
 # List files to be installed here
-INSTALL_FILES=dsetexample.f90 fileexample.f90 rwdsetexample.f90             \
-       attrexample.f90 groupexample.f90 grpsexample.f90 grpdsetexample.f90  \
-       hyperslab.f90 selectele.f90 grpit.f90 refobjexample.f90              \
-       refregexample.f90 mountexample.f90 compound.f90 ph5example.f90
+INSTALL_FILES=dsetexample.f90 fileexample.f90 rwdsetexample.f90           \
+     attrexample.f90 groupexample.f90 grpsexample.f90 grpdsetexample.f90  \
+     hyperslab.f90 selectele.f90 grpit.f90 refobjexample.f90              \
+     refregexample.f90 mountexample.f90  compound.f90 ph5example.f90
 INSTALL_SCRIPT_FILES = run-fortran-ex.sh
+INSTALL_SCRIPT_FILES = run-fortran-ex.sh
+
+
+# Add attention tests for Fortran 2003 features
+if FORTRAN_2003_CONDITIONAL_F
+  TEST_PROG +=  rwdset_fortran2003 nested_derived_type \
+      compound_fortran2003 compound_complex_fortran2003
+  INSTALL_FILES +=  rwdset_fortran2003.f90 nested_derived_type.f90 \
+      compound_fortran2003.f90 compound_complex_fortran2003.f90
+endif
+TEST_SCRIPT=testh5fc.sh
 
 # Mark this directory as part of the Fortran API
 FORTRAN_API=yes
@@ -89,6 +100,12 @@ refregexample: refregexample.f90
 mountexample: mountexample.f90
 compound: compound.f90
 ph5example: ph5example.f90
+if FORTRAN_2003_CONDITIONAL_F
+rwdset_fortran2003: rwdset_fortran2003.f90
+nested_derived_type: nested_derived_type.f90
+compound_fortran2003: compound_fortran2003.f90
+compound_complex_fortran2003: compound_complex_fortran2003.f90
+endif
 
 include $(top_srcdir)/config/examples.am
 include $(top_srcdir)/config/conclude.am