From 02469ed3132a320caa2410417307cd8f7dfd2bbb Mon Sep 17 00:00:00 2001
From: Ed Hartnett <edwardjameshartnett@gmail.com>
Date: Wed, 28 Nov 2018 15:50:38 -0700
Subject: [PATCH] updated libnetcdf.settings.in and changing makefile.am to
 adjust to possibility of netcdf-4 build without hdf5

---
 liblib/Makefile.am    | 4 +---
 libnetcdf.settings.in | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/liblib/Makefile.am b/liblib/Makefile.am
index 02c0599fe..da3cfe622 100644
--- a/liblib/Makefile.am
+++ b/liblib/Makefile.am
@@ -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
diff --git a/libnetcdf.settings.in b/libnetcdf.settings.in
index 29f734e9b..56f552d89 100644
--- a/libnetcdf.settings.in
+++ b/libnetcdf.settings.in
@@ -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@