Skip to content

Commit 82dd707

Browse files
authored
Merge pull request Unidata#3082 from WardF/ncconfig-fix.wif
Restore missing --has-nc4
2 parents 2e30f8c + 15dcffe commit 82dd707

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

configure.ac

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2072,6 +2072,7 @@ AC_SUBST(HAS_DAP2,[$enable_dap])
20722072
AC_SUBST(HAS_DAP4,[$enable_dap4])
20732073
AC_SUBST(HAS_LEGACY_MACROS,[$enable_legacy_macros])
20742074
AC_SUBST(HAS_NC2,[$nc_build_v2])
2075+
AC_SUBST(HAS_NC4,[$enable_netcdf4])
20752076
AC_SUBST(HAS_CDF5,[$enable_cdf5])
20762077
AC_SUBST(HAS_HDF4,[$enable_hdf4])
20772078
AC_SUBST(HAS_BENCHMARKS,[$enable_benchmarks])

nc-config.in

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ libsprivate="@LIBS@"
2828
has_dap="@HAS_DAP@"
2929
has_dap4="@HAS_DAP4@"
3030
has_nc2="@HAS_NC2@"
31+
has_nc4="@HAS_NC4@"
3132
has_hdf4="@HAS_HDF4@"
3233
has_pnetcdf="@HAS_PNETCDF@"
3334
has_hdf5="@HAS_HDF5@"
@@ -61,6 +62,7 @@ Available values for OPTION include:
6162
--has-dap4 whether DAP4 is enabled in this build
6263
--has-dap same as --has-dap2 (Deprecated)
6364
--has-nc2 whether NetCDF-2 API is enabled
65+
--has-nc4 whether NetCDF-4 API is enabled
6466
--has-hdf5 whether HDF5 is used in build
6567
--has-hdf4 whether HDF4 was used in build
6668
--has-logging whether logging is enabled with --enable-logging.
@@ -104,6 +106,7 @@ all()
104106
echo " --has-dap2 -> $has_dap"
105107
echo " --has-dap4 -> $has_dap4"
106108
echo " --has-nc2 -> $has_nc2"
109+
echo " --has-nc4 -> $has_nc4"
107110
echo " --has-hdf5 -> $has_hdf5"
108111
echo " --has-hdf4 -> $has_hdf4"
109112
echo " --has-logging -> $has_logging"
@@ -200,6 +203,10 @@ while test $# -gt 0; do
200203
echo $has_nc2
201204
;;
202205

206+
--has-nc4)
207+
echo $has_nc4
208+
;;
209+
203210
--has-hdf5)
204211
echo $has_hdf5
205212
;;

0 commit comments

Comments
 (0)