From d05e1c8ca189173070a2fc1c30802ec8be479085 Mon Sep 17 00:00:00 2001 From: Elena Pourmal Date: Fri, 29 Jun 2012 15:39:37 -0500 Subject: [svn-r22503] Maintenance: See HELPDESK-643 issue in JIRA. NAG Fortran compiler doesn't like the current tH5E_F03.f90 file that has only comments and no executable statements. Removed tH5E_F03.f90 from the list of modules to build. Tested on jam with PGI compiler using --enable-fortran2003 flag. Will point the user to a snapshot when it is available. --- configure | 2 +- fortran/test/Makefile.am | 6 +++++- fortran/test/Makefile.in | 10 +++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/configure b/configure index f11aa89..6ba43e8 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 22474 2012-06-19 13:45:12Z byrn . +# From configure.in Id: configure.in 22488 2012-06-25 00:22:53Z hdftest . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.68 for HDF5 1.8.10-snap5. # diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am index b261785..d8cdef9 100644 --- a/fortran/test/Makefile.am +++ b/fortran/test/Makefile.am @@ -67,8 +67,12 @@ fortranlib_test_1_8_SOURCES = fortranlib_test_1_8.f90 \ tH5F.f90 tH5O.f90 tH5A_1_8.f90 tH5G_1_8.f90 if FORTRAN_2003_CONDITIONAL_F +# NAG compiler doesn't like the current tH5E_F03.f90 file since it has only comments +# and no executable statements. +# Removed from the list of modules to build. EIP 2012-06-28 +# tH5F.f90 tH5E_F03.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90 fortranlib_test_F03_SOURCES = fortranlib_test_F03.f90 \ - tH5F.f90 tH5E_F03.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90 + tH5F.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90 endif diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 27198a8..d13aca4 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -118,10 +118,9 @@ fortranlib_test_1_8_LDADD = $(LDADD) fortranlib_test_1_8_DEPENDENCIES = libh5test_fortran.la $(LIBH5TEST) \ $(LIBH5F) $(LIBHDF5) am__fortranlib_test_F03_SOURCES_DIST = fortranlib_test_F03.f90 \ - tH5F.f90 tH5E_F03.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90 + tH5F.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90 @FORTRAN_2003_CONDITIONAL_F_TRUE@am_fortranlib_test_F03_OBJECTS = fortranlib_test_F03.$(OBJEXT) \ @FORTRAN_2003_CONDITIONAL_F_TRUE@ tH5F.$(OBJEXT) \ -@FORTRAN_2003_CONDITIONAL_F_TRUE@ tH5E_F03.$(OBJEXT) \ @FORTRAN_2003_CONDITIONAL_F_TRUE@ tH5L_F03.$(OBJEXT) \ @FORTRAN_2003_CONDITIONAL_F_TRUE@ tH5P_F03.$(OBJEXT) \ @FORTRAN_2003_CONDITIONAL_F_TRUE@ tH5T_F03.$(OBJEXT) @@ -492,8 +491,13 @@ fortranlib_test_SOURCES = fortranlib_test.f90 \ fortranlib_test_1_8_SOURCES = fortranlib_test_1_8.f90 \ tH5F.f90 tH5O.f90 tH5A_1_8.f90 tH5G_1_8.f90 + +# NAG compiler doesn't like the current tH5E_F03.f90 file since it has only comments +# and no executable statements. +# Removed from the list of modules to build. EIP 2012-06-28 +# tH5F.f90 tH5E_F03.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90 @FORTRAN_2003_CONDITIONAL_F_TRUE@fortranlib_test_F03_SOURCES = fortranlib_test_F03.f90 \ -@FORTRAN_2003_CONDITIONAL_F_TRUE@ tH5F.f90 tH5E_F03.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90 +@FORTRAN_2003_CONDITIONAL_F_TRUE@ tH5F.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90 fflush1_SOURCES = fflush1.f90 fflush2_SOURCES = fflush2.f90 -- cgit v0.12