diff --git a/configure b/configure
index 022f4c9b49fadbd8e8b89f28026614ba760a8ae4..e53512feeb9e5181b1a6fd09f03a94065a622257 100755
--- a/configure
+++ b/configure
@@ -28114,63 +28114,7 @@ else
$as_echo "no" >&6; }
fi
-
- if test "x$NC_CONFIG" != "x"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking netcdf's OpenDAP support" >&5
-$as_echo_n "checking netcdf's OpenDAP support... " >&6; }
- if test "x$($NC_CONFIG --has-dap)" = "xyes"; then :
-
-$as_echo "#define HAVE_LIBNC_DAP 1" >>confdefs.h
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking netcdf's nc2 support" >&5
-$as_echo_n "checking netcdf's nc2 support... " >&6; }
- if test "x$($NC_CONFIG --has-nc2)" = "xyes"; then :
-
-$as_echo "#define HAVE_NETCDF2 1" >>confdefs.h
-
- ENABLE_NC2=yes
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking netcdf's nc4 support" >&5
-$as_echo_n "checking netcdf's nc4 support... " >&6; }
- if test "x$($NC_CONFIG --has-nc4)" = "xyes"; then :
-
-$as_echo "#define HAVE_NETCDF4 1" >>confdefs.h
-
- ENABLE_NC4=yes
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking netcdf's nc4/hdf5 support" >&5
-$as_echo_n "checking netcdf's nc4/hdf5 support... " >&6; }
- if test "x$($NC_CONFIG --has-hdf5)" = "xyes"; then :
-
-$as_echo "#define HAVE_NC4HDF5 1" >>confdefs.h
-
- ENABLE_NC4HDF5=yes
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find nc-config! go on with default configuration" >&5
-$as_echo "$as_me: WARNING: Could not find nc-config! go on with default configuration" >&2;}
-fi ;; #(
+ ;; #(
*) :
if test -d "$with_netcdf"; then :
NETCDF_ROOT=$with_netcdf
@@ -28251,8 +28195,6 @@ fi
NETCDF_LIBS=" -L$NETCDF_ROOT/lib -lnetcdf"
NETCDF_INCLUDE=" -I$NETCDF_ROOT/include"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking nc-config script" >&5
-$as_echo_n "checking nc-config script... " >&6; }
# Extract the first word of "nc-config", so it can be a program name with args.
set dummy nc-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -28290,77 +28232,103 @@ $as_echo "no" >&6; }
fi
- if test "x$NC_CONFIG" != "x"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking netcdf's OpenDAP support" >&5
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $with_netcdf is not a directory! NetCDF suppressed" >&5
+$as_echo "$as_me: $with_netcdf is not a directory! NetCDF suppressed" >&6;}
+fi ;; #(
+ *) :
+ ;;
+esac
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NetCDF library" >&5
+$as_echo_n "checking for NetCDF library... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
+$as_echo "suppressed" >&6; }
+fi
+
+
+if test "x$ENABLE_NETCDF" = xyes; then :
+ if ${NC_CONFIG:+false} :; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find nc-config! go on with default configuration" >&5
+$as_echo "$as_me: WARNING: Could not find nc-config! go on with default configuration" >&2;}
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking netcdf's OpenDAP support" >&5
$as_echo_n "checking netcdf's OpenDAP support... " >&6; }
- if test "x$($NC_CONFIG --has-dap)" = "xyes"; then :
+if ${acx_cv_have_libnc_dap+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ acx_cv_have_libnc_dap=no
+ test "x$NC_CONFIG" != "x" && \
+ test "x$($NC_CONFIG --has-dap)" = "xyes" && \
+ acx_cv_have_libnc_dap=yes
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_have_libnc_dap" >&5
+$as_echo "$acx_cv_have_libnc_dap" >&6; }
+ if test "x$acx_cv_have_libnc_dap" = xyes; then :
$as_echo "#define HAVE_LIBNC_DAP 1" >>confdefs.h
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking netcdf's nc2 support" >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking netcdf's nc2 support" >&5
$as_echo_n "checking netcdf's nc2 support... " >&6; }
- if test "x$($NC_CONFIG --has-nc2)" = "xyes"; then :
+if ${acx_cv_have_netcdf2+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ acx_cv_have_netcdf2=no
+ test "x$NC_CONFIG" != "x" && \
+ test "x$($NC_CONFIG --has-nc2)" = "xyes" && \
+ acx_cv_have_netcdf2=yes
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_have_netcdf2" >&5
+$as_echo "$acx_cv_have_netcdf2" >&6; }
+ if test "x$acx_cv_have_netcdf2" = xyes; then :
$as_echo "#define HAVE_NETCDF2 1" >>confdefs.h
- ENABLE_NC2=yes
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ ENABLE_NC2=yes
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking netcdf's nc4 support" >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking netcdf's nc4 support" >&5
$as_echo_n "checking netcdf's nc4 support... " >&6; }
- if test "x$($NC_CONFIG --has-nc4)" = "xyes"; then :
+if ${acx_cv_have_netcdf4+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ acx_cv_have_netcdf4=no
+ test "x$NC_CONFIG" != "x" && \
+ test "x$($NC_CONFIG --has-nc4)" = "xyes" && \
+ acx_cv_have_netcdf4=yes
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_have_netcdf4" >&5
+$as_echo "$acx_cv_have_netcdf4" >&6; }
+ if test "x$acx_cv_have_netcdf4" = xyes; then :
$as_echo "#define HAVE_NETCDF4 1" >>confdefs.h
- ENABLE_NC4=yes
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ ENABLE_NC4=yes
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking netcdf's nc4/hdf5 support" >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking netcdf's nc4/hdf5 support" >&5
$as_echo_n "checking netcdf's nc4/hdf5 support... " >&6; }
- if test "x$($NC_CONFIG --has-hdf5)" = "xyes"; then :
+if ${acx_cv_have_nc4hdf5+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ acx_cv_have_nc4hdf5=no
+ test "x$NC_CONFIG" != "x" && \
+ test "x$($NC_CONFIG --has-hdf5)" = "xyes" && \
+ acx_cv_have_nc4hdf5=yes
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_have_nc4hdf5" >&5
+$as_echo "$acx_cv_have_nc4hdf5" >&6; }
+ if test "x$acx_cv_have_nc4hdf5" = xyes; then :
$as_echo "#define HAVE_NC4HDF5 1" >>confdefs.h
- ENABLE_NC4HDF5=yes
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Could not find nc-config! go on with default configuration" >&5
-$as_echo "Could not find nc-config! go on with default configuration" >&6; }
+ ENABLE_NC4HDF5=yes
fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: $with_netcdf is not a directory! NetCDF suppressed" >&5
-$as_echo "$as_me: $with_netcdf is not a directory! NetCDF suppressed" >&6;}
-fi ;; #(
- *) :
- ;;
-esac
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NetCDF library" >&5
-$as_echo_n "checking for NetCDF library... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
-$as_echo "suppressed" >&6; }
fi
-
if test "x$ENABLE_NC4HDF5" = "xyes"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing H5TS_mutex_lock" >&5
$as_echo_n "checking for library containing H5TS_mutex_lock... " >&6; }