Merge branch 'master' into v3plug.dmh

configure.ac

@@ -2127,6 +2127,7 @@ AC_SUBST(HAS_DAP2,[$enable_dap])
 AC_SUBST(HAS_DAP4,[$enable_dap4])
 AC_SUBST(HAS_LEGACY_MACROS,[$enable_legacy_macros])
 AC_SUBST(HAS_NC2,[$nc_build_v2])
+AC_SUBST(HAS_NC4,[$enable_netcdf4])
 AC_SUBST(HAS_CDF5,[$enable_cdf5])
 AC_SUBST(HAS_HDF4,[$enable_hdf4])
 AC_SUBST(HAS_BENCHMARKS,[$enable_benchmarks])

nc-config.in

@@ -28,6 +28,7 @@ libsprivate="@LIBS@"
 has_dap="@HAS_DAP@"
 has_dap4="@HAS_DAP4@"
 has_nc2="@HAS_NC2@"
+has_nc4="@HAS_NC4@"
 has_hdf4="@HAS_HDF4@"
 has_pnetcdf="@HAS_PNETCDF@"
 has_hdf5="@HAS_HDF5@"
@@ -61,6 +62,7 @@ Available values for OPTION include:
   --has-dap4          whether DAP4 is enabled in this build
   --has-dap           same as --has-dap2 (Deprecated)
   --has-nc2           whether NetCDF-2 API is enabled
+  --has-nc4           whether NetCDF-4 API is enabled
   --has-hdf5          whether HDF5 is used in build
   --has-hdf4          whether HDF4 was used in build
   --has-logging       whether logging is enabled with --enable-logging.
@@ -104,6 +106,7 @@ all()
         echo "  --has-dap2          -> $has_dap"
         echo "  --has-dap4          -> $has_dap4"
         echo "  --has-nc2           -> $has_nc2"
+        echo "  --has-nc4           -> $has_nc4"
         echo "  --has-hdf5          -> $has_hdf5"
         echo "  --has-hdf4          -> $has_hdf4"
         echo "  --has-logging       -> $has_logging"
@@ -200,6 +203,10 @@ while test $# -gt 0; do
         echo $has_nc2
         ;;
 
+    --has-nc4)
+        echo $has_nc4
+        ;;
+
     --has-hdf5)
         echo $has_hdf5
         ;;