diff --git a/configure.ac b/configure.ac index 8ad88a66135..9e9a880eeb2 100644 --- a/configure.ac +++ b/configure.ac @@ -280,6 +280,7 @@ fi if test "x$enable_netcdf_integration" = xyes; then AC_DEFINE([HDF5_PARALLEL],[1],[Does HDF5 library provide parallel access]) AC_DEFINE([USE_NETCDF4],[1],[Does HDF5 library provide parallel access]) + AC_DEFINE([NETCDF_INTEGRATION],[1],[Are we building with netCDF integration]) fi AM_CONDITIONAL(BUILD_NCINT, [test "x$enable_netcdf_integration" = xyes]) diff --git a/src/Makefile.am b/src/Makefile.am index 4eaa356d1c8..eab6ab0d2f1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,7 +5,7 @@ # Does the user want to build fortran? if BUILD_FORTRAN FLIB = flib -endif +endif # BUILD_FORTRAN # Are we building with the GPTL timing library? if USE_GPTL diff --git a/src/clib/Makefile.am b/src/clib/Makefile.am index a938e0d867a..66c7a948825 100644 --- a/src/clib/Makefile.am +++ b/src/clib/Makefile.am @@ -7,6 +7,7 @@ lib_LTLIBRARIES = libpioc.la # Are we building with netCDF integration? if BUILD_NCINT libpioc_la_LIBADD = ../ncint/libncint.la +libpioc_la_CPPFLAGS = -I${top_srcdir}/src/ncint endif # BUILD_NCINT # These linker flags specify libtool version info. diff --git a/src/clib/pio.h b/src/clib/pio.h index f1203456ca0..56b36bd732d 100644 --- a/src/clib/pio.h +++ b/src/clib/pio.h @@ -1250,6 +1250,7 @@ extern "C" { int nc_init_intracomm(MPI_Comm comp_comm, int num_iotasks, int stride, int base, int rearr, int *iosysidp); + int nc_set_iosystem(int iosysid); int nc_free_iosystem(int iosysid); int nc_init_decomp(int iosysid, int pio_type, int ndims, const int *gdimlen,