Skip to content
Snippets Groups Projects

Consolidation with CDI-PIO (develop)

Merged Consolidation with CDI-PIO (develop)
m300488/develop-rebase into develop
Merged Sergey Kosukhin requested to merge m300488/develop-rebase into develop
Viewing commit b1b8ce10
Show latest version
17 files
+ 448
− 439
Compare changes
  • Side-by-side
  • Inline
Files
17
  • b1b8ce10
    Sergey Kosukhin
    Rewrite the configure script. · b1b8ce10
    Sergey Kosukhin authored 
    1. Check for FC only if one of the Fortran interfaces is requested.

2. Fail if the Fortran ISO C interface is enabled but FC is not found.

3. Check for F77 only if the C Fortran interface is requested and either FC was
   not found or the user set F77 explicitly. In the latter case, we make sure
   that the generated library is compatible with both FC and F77.

4. Check for Fortran interfaces of MPI and YAXT only when needed and do not fail
   if either of them not found: we can still provide the C Fortran interface.

5. Refactor the Automake conditionals: remove redundant, rename the required in
   a consistent way. Conditionals from acx_options.m4 left unchanged since they
   might affect the integration into CDO.

6. General clean-up and refactoring.

7. Temporarily drop support for the experimental ruby and python interfaces.
examples/pio/Makefile.am
+ 14
− 11
@@ -2,34 +2,37 @@ check_PROGRAMS = \
collectData \
collectDataNStreams
if USE_MPI
if ENABLE_MPI
check_PROGRAMS += compareResourcesArray
endif
endif ENABLE_MPI
if USE_FC
if ENABLE_CF_INTERFACE
check_PROGRAMS += collectData2003
endif
endif ENABLE_CF_INTERFACE
AM_CPPFLAGS = -I$(top_srcdir)/src $(YAXT_C_INCLUDE)
if ENABLE_MPI
AM_CPPFLAGS += -DUSE_MPI
endif ENABLE_MPI
AM_CFLAGS = $(MPI_C_INCLUDE)
AM_FCFLAGS = $(FPP_INCOPT)$(top_srcdir)/src $(MPI_FC_INCLUDE)
if USE_MPI
AM_FCFLAGS += $(FPP_DEFOPT)USE_MPI
endif
AM_FCFLAGS = $(FC_OPTINC)$(top_srcdir)/src $(MPI_FC_INCLUDE)
if ENABLE_MPI
AM_FCFLAGS += $(FC_DEFINE)USE_MPI
endif ENABLE_MPI
AM_LDFLAGS =
if ENABLE_ALL_STATIC
AM_LDFLAGS += -all-static
endif
if USE_MPI
if ENABLE_MPI
LDADD = $(top_builddir)/src/libcdipio.la $(top_builddir)/src/libcdi.la $(YAXT_LIBS) $(MPI_C_LIB)
collectData2003_LDADD = $(top_builddir)/src/libcdipio.la $(top_builddir)/src/libcdi.la $(YAXT_FC_LIB) $(MPI_FC_LIB)
else
else !ENABLE_MPI
LDADD = $(top_builddir)/src/libcdi.la
collectData2003_LDADD = $(top_builddir)/src/libcdi.la
endif
endif !ENABLE_MPI
collectData_SOURCES = collectData.c

Imprint | Privacy Policy