updated libnetcdf.settings.in and changing makefile.am to adjust to possibility of netcdf-4 build without hdf5

This commit is contained in:
Ed Hartnett 2018-11-28 15:50:38 -07:00
parent c824ad9ec9
commit 02469ed313
2 changed files with 2 additions and 3 deletions

View File

@ -41,7 +41,7 @@ libnetcdf_la_LIBADD += ${top_builddir}/libsrcp/libnetcdfp.la
endif # USE_PNETCDF
# + hdf5
if USE_NETCDF4
if USE_HDF5
AM_CPPFLAGS += -I${top_srcdir}/libhdf5
libnetcdf_la_LIBADD += ${top_builddir}/libhdf5/libnchdf5.la
endif # USE_NETCDF4
@ -66,10 +66,8 @@ endif # ENABLE_DAP4
# NetCDF-4 ...
if USE_NETCDF4
AM_CPPFLAGS += -I${top_srcdir}/libsrc4
libnetcdf_la_LIBADD += ${top_builddir}/libsrc4/libnetcdf4.la
endif #USE_NETCDF4
if ISCYGWIN

View File

@ -26,6 +26,7 @@ Extra libraries: @LIBS@
--------
NetCDF-2 API: @HAS_NC2@
HDF4 Support: @HAS_HDF4@
HDF5 Support: @HAS_HDF5@
NetCDF-4 API: @HAS_NC4@
NC-4 Parallel Support: @HAS_PARALLEL4@
PnetCDF Support: @HAS_PNETCDF@