Skip to content
Commits on Source (10)
Show whitespace changes
Inline Side-by-side
.gitignore
View file @ cd4b842b
#####
# End ignored generated files.
#####
### 'Normal' gitignore files.
autom4te.cache
debug.txt
......
.travis.yml
View file @ cd4b842b
......@@ -37,4 +37,4 @@ before_install:
script:
- docker run --rm -it -h "$CURHOST" -e USEDASH=FALSE -e RUNF=TRUE -e RUNCXX=OFF -e RUNP=OFF -e RUNNCO=OFF -e USECMAKE=$USECMAKE -e USEAC=$USEAC -e DISTCHECK=$DISTCHECK -e COPTS="$COPTS" -e AC_OPTS="$AC_OPTS" -e CTEST_OUTPUT_ON_FAILURE=1 -v $(pwd):/netcdf-c -e USE_LOCAL_CP=$USECP -e TESTPROC=100 -e ENABLE_FILTER_TESTING=$TESTFILTER $DOCKIMG
- docker run --rm -it -h "$CURHOST" -e USEDASH=FALSE -e RUNF=OFF -e RUNCXX=OFF -e RUNP=OFF -e RUNNCO=OFF -e USECMAKE=$USECMAKE -e USEAC=$USEAC -e DISTCHECK=$DISTCHECK -e COPTS="$COPTS" -e AC_OPTS="$AC_OPTS" -e CTEST_OUTPUT_ON_FAILURE=1 -v $(pwd):/netcdf-c -e USE_LOCAL_CP=$USECP -e TESTPROC=100 -e ENABLE_FILTER_TESTING=$TESTFILTER $DOCKIMG
CMakeInstallation.cmake
View file @ cd4b842b
# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
# 2015, 2016, 2017, 2018
# University Corporation for Atmospheric Research/Unidata.
# See netcdf-c/COPYRIGHT file for more info.
#####
# Contains variables and settings used
# by the CMake build system in order to
......@@ -32,6 +38,7 @@ SET(CPACK_SOURCE_IGNORE_FILES "${CPACK_SOURCE_IGNORE_FILES}"
"/obsolete/"
"/unknown/"
".*~"
".git/"
)
###
......@@ -50,9 +57,9 @@ IF(WIN32)
SET(CPACK_NSIS_CONTACT "support-netcdf@unidata.ucar.edu")
SET(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
SET(CPACK_NSIS_MENU_LINKS
"http://www.unidata.ucar.edu/netcdf" "Unidata Website"
"http://www.unidata.ucar.edu/netcdf/docs" "NetCDF Stable Documentation"
"http://www.unidata.ucar.edu/netcdf/docs_rc" "NetCDF Unstable Documentation")
"http://www.unidata.ucar.edu/software/netcdf" "Unidata Website"
"http://www.unidata.ucar.edu/software/netcdf/docs" "NetCDF Stable Documentation"
"http://www.unidata.ucar.edu/software/netcdf/docs_rc" "NetCDF Unstable Documentation")
ENDIF()
......@@ -97,7 +104,7 @@ ENDIF()
IF(APPLE)
SET(CPACK_SOURCE_GENERATOR "TGZ")
SET(CPACK_GENERATOR "PackageMaker" "STGZ" "TBZ2" "TGZ" "ZIP")
SET(CPACK_GENERATOR "productbuild" "STGZ" "TBZ2" "TGZ" "ZIP")
ENDIF()
##
......
CMakeLists.txt
View file @ cd4b842b
......@@ -27,7 +27,7 @@ set(PACKAGE "netCDF" CACHE STRING "")
SET(NC_VERSION_MAJOR 4)
SET(NC_VERSION_MINOR 6)
SET(NC_VERSION_PATCH 2)
SET(NC_VERSION_NOTE "")
SET(NC_VERSION_NOTE ".1")
SET(netCDF_VERSION ${NC_VERSION_MAJOR}.${NC_VERSION_MINOR}.${NC_VERSION_PATCH}${NC_VERSION_NOTE})
SET(VERSION ${netCDF_VERSION})
SET(NC_VERSION ${netCDF_VERSION})
......@@ -82,7 +82,7 @@ IF(MSVC)
ENDIF()
#Add custom CMake Module
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/"
SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/"
CACHE INTERNAL "Location of our custom CMake modules.")
# auto-configure style checks, other CMake modules.
......@@ -750,7 +750,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
SET(H5_USE_16_API 0)
ENDIF()
FIND_PATH(HAVE_HDF5_H hdf5.h)
FIND_PATH(HAVE_HDF5_H hdf5.h PATHS ${HDF5_INCLUDE_DIR})
IF(NOT HAVE_HDF5_H)
MESSAGE(FATAL_ERROR "Compiling a test with hdf5 failed. Either hdf5.h cannot be found, or the log messages should be checked for another reason.")
ELSE(NOT HAVE_HDF5_H)
......@@ -846,13 +846,6 @@ OPTION(ENABLE_DAP_LONG_TESTS "Enable DAP long tests." OFF)
OPTION(ENABLE_DAP_REMOTE_TESTS "Enable DAP remote tests." ON)
SET(REMOTETESTSERVERS "149.165.169.123:8080,remotetest.unidata.ucar.edu" CACHE STRING "test servers to use for remote test")
# If netCDF4 and DAP, Option for DAP groups.
IF(ENABLE_NETCDF_4 AND ENABLE_DAP2)
OPTION(ENABLE_DAP_GROUPS "Whether netcdf4 group names should be enabled." ON)
ELSE()
SET(ENABLE_DAP_GROUPS OFF CACHE BOOL "Whether netcdf4 group names should be enabled.")
ENDIF()
# Enable some developer-only tests
OPTION(ENABLE_EXTRA_TESTS "Enable Extra tests. Some may not work because of known issues. Developers only." OFF)
IF(ENABLE_EXTRA_TESTS)
......@@ -1150,14 +1143,14 @@ IF (ENABLE_PARALLEL_TESTS AND NOT USE_PARALLEL)
ENDIF()
# Enable special filter test; experimental when using cmake.
OPTION(ENABLE_FILTER_TESTING "Enable filter testing. Ignored if shared libraries or netCDF4 are not enabled" OFF)
IF(NOT ENABLE_NETCDF4)
OPTION(ENABLE_FILTER_TESTING "Enable filter testing. Ignored if shared libraries or netCDF4 are not enabled" ${ENABLE_NETCDF_4})
IF(ENABLE_FILTER_TESTING AND NOT ENABLE_NETCDF_4)
MESSAGE(WARNING "ENABLE_FILTER_TESTING requires netCDF-4. Disabling.")
SET(ENABLE_FILTER_TESTING OFF CACHE BOOL "")
SET(ENABLE_FILTER_TESTING OFF)
ENDIF()
IF(NOT BUILD_SHARED_LIBS)
MESSAGE(WARNING "ENABLE_FILTER_TESTING requires shared libraries. Disabling.")
SET(ENABLE_FILTER_TESTING OFF CACHE BOOL "")
SET(ENABLE_FILTER_TESTING OFF)
ENDIF()
# Determine whether or not to generate documentation.
......@@ -1408,8 +1401,13 @@ CHECK_FUNCTION_EXISTS(_filelengthi64 HAVE_FILE_LENGTH_I64)
CHECK_FUNCTION_EXISTS(mmap HAVE_MMAP)
CHECK_FUNCTION_EXISTS(mremap HAVE_MREMAP)
IF(NOT HAVE_MMMAP OR NOT HAVE_MREMAP)
MESSAGE(WARNING "mmap or mremap not found: disabling MMAP support.")
# Check to see if MAP_ANONYMOUS is defined.
CHECK_C_SOURCE_COMPILES("
#include <sys/mmap.h>
int main() {int x = MAP_ANONYMOUS;}" HAVE_MAPANON)
IF(NOT HAVE_MMMAP OR NOT HAVE_MREMAP OR NOT HAVE_MAPANON)
MESSAGE(WARNING "mmap or mremap or MAP_ANONYMOUS not found: disabling MMAP support.")
SET(ENABLE_MMAP OFF)
ENDIF()
......@@ -1714,10 +1712,6 @@ add_subdirectory("include")
add_subdirectory(libdispatch)
add_subdirectory(libsrc)
IF(ENABLE_FILTER_TESTING)
add_subdirectory(plugins)
ENDIF()
IF(USE_PNETCDF)
add_subdirectory(libsrcp)
ENDIF(USE_PNETCDF)
......@@ -1743,6 +1737,10 @@ ENDIF()
add_subdirectory(liblib)
IF(ENABLE_FILTER_TESTING)
add_subdirectory(plugins)
ENDIF()
# For tests and utilities, we are no longer
# exporting symbols but rather importing them.
IF(BUILD_DLL)
......
COPYRIGHT
View file @ cd4b842b
The NetCDF Copyright.
Copyright 2018 Unidata
Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
2015, 2016
University Corporation for Atmospheric Research/Unidata.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Portions of this software were developed by the Unidata Program at the
University Corporation for Atmospheric Research.
Access and use of this software shall impose the following obligations
and understandings on the user. The user is granted the right, without
any fee or cost, to use, copy, modify, alter, enhance and distribute
this software, and any derivative works thereof, and its supporting
documentation for any purpose whatsoever, provided that this entire
notice appears in all copies of the software, derivative works and
supporting documentation. Further, UCAR requests that the user credit
UCAR/Unidata in any publications that result from the use of this
software or in any product that includes this software, although this
is not an obligation. The names UCAR and/or Unidata, however, may not
be used in any advertising or publicity to endorse or promote any
products or commercial entity unless specific written permission is
obtained from UCAR/Unidata. The user also understands that
UCAR/Unidata is not obligated to provide the user with any support,
consulting, training or assistance of any kind with regard to the use,
operation and performance of this software nor to provide the user
with any updates, revisions, new versions or "bug fixes."
THIS SOFTWARE IS PROVIDED BY UCAR/UNIDATA "AS IS" AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL UCAR/UNIDATA BE LIABLE FOR ANY SPECIAL,
INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
WITH THE ACCESS, USE OR PERFORMANCE OF THIS SOFTWARE.
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
CTestConfig.cmake.in
View file @ cd4b842b
## This file should be placed in the root directory of your project.
# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
# 2015, 2016, 2017, 2018
# University Corporation for Atmospheric Research/Unidata.
# See netcdf-c/COPYRIGHT file for more info.
# This file should be placed in the root directory of your project.
## Then modify the CMakeLists.txt file in the root directory of your
## project to incorporate the testing dashboard.
##
......
CTestCustom.cmake
View file @ cd4b842b
# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
# 2015, 2016, 2017, 2018
# University Corporation for Atmospheric Research/Unidata.
# See netcdf-c/COPYRIGHT file for more info.
## This file is used to customize CTest.
## See:
##
......
FixBundle.cmake.in
View file @ cd4b842b
# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
# 2015, 2016, 2017, 2018
# University Corporation for Atmospheric Research/Unidata.
# See netcdf-c/COPYRIGHT file for more info.
INCLUDE(BundleUtilities)
# Set bundle to the full path name of the executable
......
Makefile.am
View file @ cd4b842b
......@@ -40,8 +40,12 @@ endif
# Is the user building netCDF-4?
if USE_NETCDF4
H5_TEST_DIR = h5_test
LIBSRC4_DIR = libsrc4
endif
# Is the user building with HDF5?
if USE_HDF5
H5_TEST_DIR = h5_test
LIBHDF5 = libhdf5
NC_TEST4 = nc_test4
endif
......
Makefile.in
View file @ cd4b842b
......@@ -478,10 +478,12 @@ pkgconfig_DATA = netcdf.pc
@BUILD_EXAMPLES_TRUE@EXAMPLES = examples
# Is the user building netCDF-4?
@USE_NETCDF4_TRUE@H5_TEST_DIR = h5_test
@USE_NETCDF4_TRUE@LIBSRC4_DIR = libsrc4
@USE_NETCDF4_TRUE@LIBHDF5 = libhdf5
@USE_NETCDF4_TRUE@NC_TEST4 = nc_test4
# Is the user building with HDF5?
@USE_HDF5_TRUE@H5_TEST_DIR = h5_test
@USE_HDF5_TRUE@LIBHDF5 = libhdf5
@USE_HDF5_TRUE@NC_TEST4 = nc_test4
# Build the dap2 client
@ENABLE_DAP_TRUE@OCLIB = oc2
......
RELEASE_NOTES.md
View file @ cd4b842b
......@@ -5,7 +5,20 @@ Release Notes {#RELEASE_NOTES}
This file contains a high-level description of this package's evolution. Releases are in reverse chronological order (most recent first). Note that, as of netcdf 4.2, the `netcdf-c++` and `netcdf-fortran` libraries have been separated into their own libraries.
## 4.6.2 - November 19, 2018
## 4.6.3 - TBD
## 4.6.2.1 - February 15, 2019
### Maintenance Release
* Update the license from the home-brewed NetCDF license to the standard 3-Clause BSD License. This change does not result in any new restrictions; it is merely the adoption of a standard, well-known and well-understood license in place of the historic NetCDF license written at Unidata. This is part of a broader push by Unidata to adopt modern, standardized licensing.
* [BugFix] Corrected DAP-releated issues on big-endian machines. See [Github #1321](https://github.com/Unidata/netcdf-c/issues/1321), [Github #1302](https://github.com/Unidata/netcdf-c/issues/1302) for more information.
* [BugFix][Enhancement] Various and sundry bugfixes and performance enhancements, thanks got @edhartnett, @gsjaardema, @t-b, @wkliao, and all of our other contributors.
* [Enhancement] Extended `nccopy -F` syntax to support multiple variables with a single invocation. See [Github #1311](https://github.com/Unidata/netcdf-c/issues/1311) for more information.
* [BugFix] Corrected an issue where DAP2 was incorrectly converting signed bytes, resulting in an erroneous error message under some circumstances. See [GitHub #1317](https://github.com/Unidata/netcdf-c/issues/1317) for more information. See [Github #1319](https://github.com/Unidata/netcdf-c/issues/1319) for related information.
* [BugFix][Enhancement] Modified `nccopy` so that `_NCProperties` is not copied over verbatim but is instead generated based on the version of `libnetcdf` used when copying the file. Additionally, `_NCProperties` are displayed if/when associated with a netcdf3 file, now. See [GitHub #803](https://github.com/Unidata/netcdf-c/issues/803) for more information.
## 4.6.2 - November 16, 2018
* [Enhancement] Lazy att read - only read atts when user requests one of them. See [GitHub #857](https://github.com/Unidata/netcdf-c/issues/857).
* [Enhancement] Fast global att read - when global atts are read, they are read much more quickly. See [GitHub #857](https://github.com/Unidata/netcdf-c/issues/857).
......
appveyor.yml
View file @ cd4b842b
......@@ -36,7 +36,7 @@ build: off
build_script:
- cmd: mkdir build
- cmd: cd build
- cmd: cmake .. -G "%CMAKE_GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%INSTALL_LOC% -DENABLE_BASH_SCRIPT_TESTING=OFF
- cmd: cmake .. -G "%CMAKE_GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%INSTALL_LOC% -DENABLE_BASH_SCRIPT_TESTING=OFF -DENABLE_FILTER_TESTING=OFF
- cmd: if errorlevel 1 exit 1
- cmd: cmake --build . --config Release -- /maxcpucount:4
......
bootstrap 0 → 100755
View file @ cd4b842b
#!/bin/sh
autoreconf -ivf
cmake_uninstall.cmake.in
View file @ cd4b842b
# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
# 2015, 2016, 2017, 2018
# University Corporation for Atmospheric Research/Unidata.
# See netcdf-c/COPYRIGHT file for more info.
CMAKE_POLICY(SET CMP0007 OLD)
if (NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
......
config.h.cmake.in
View file @ cd4b842b
/*! \file
Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
2015, 2016, 2017, 2018
University Corporation for Atmospheric Research/Unidata.
See \ref copyright file for more info.
*/
#ifndef CONFIG_H
#define CONFIG_H
......@@ -122,9 +132,6 @@ are set when opening a binary file on Windows. */
/* if true, build DAP4 Client */
#cmakedefine ENABLE_DAP4 1
/* if true, enable DAP group names */
#cmakedefine ENABLE_DAP_GROUPS 1
/* if true, do remote tests */
#cmakedefine ENABLE_DAP_REMOTE_TESTS 1
......
config.h.in
View file @ cd4b842b
......@@ -38,9 +38,6 @@
/* if true, build DAP4 Client */
#undef ENABLE_DAP4
/* if true, enable DAP group names */
#undef ENABLE_DAP_GROUPS
/* if true, do remote tests */
#undef ENABLE_DAP_REMOTE_TESTS
......
configure
View file @ cd4b842b
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for netCDF 4.6.2.
# Generated by GNU Autoconf 2.69 for netCDF 4.6.2.1.
#
# Report bugs to <support-netcdf@unidata.ucar.edu>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='netCDF'
PACKAGE_TARNAME='netcdf-c'
PACKAGE_VERSION='4.6.2'
PACKAGE_STRING='netCDF 4.6.2'
PACKAGE_VERSION='4.6.2.1'
PACKAGE_STRING='netCDF 4.6.2.1'
PACKAGE_BUGREPORT='support-netcdf@unidata.ucar.edu'
PACKAGE_URL=''
 
......@@ -940,6 +940,7 @@ enable_fsync
enable_jna
enable_netcdf_4
enable_netcdf4
enable_hdf5
enable_dynamic_loading
enable_hdf4
enable_hdf4_file_tests
......@@ -959,7 +960,6 @@ enable_dap
enable_dependency_tracking
enable_dap_remote_tests
enable_dap_auth_tests
enable_dap_groups
with_testservers
enable_dap_long_tests
enable_strict_null_byte_header_padding
......@@ -1546,7 +1546,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures netCDF 4.6.2 to adapt to many kinds of systems.
\`configure' configures netCDF 4.6.2.1 to adapt to many kinds of systems.
 
Usage: $0 [OPTION]... [VAR=VALUE]...
 
......@@ -1617,7 +1617,7 @@ fi
 
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of netCDF 4.6.2:";;
short | recursive ) echo "Configuration of netCDF 4.6.2.1:";;
esac
cat <<\_ACEOF
 
......@@ -1657,6 +1657,7 @@ Optional Features:
--disable-netcdf-4 do not build with netcdf-4 (else HDF5 and zlib
required)
--disable-netcdf4 (just a synonym for --disable-netcdf-4)
--disable-hdf5 do not build with HDF5
--enable-dynamic-loading
enable dynamic loading for use with supported hdf5
installs (libdl, HDF5 required)
......@@ -1686,7 +1687,6 @@ Optional Features:
--disable-dap-remote-tests
disable dap remote tests
--enable-dap-auth-tests enable dap remote authorization tests
--disable-dap-groups disable [netcdf4] DAP2 group names
--enable-dap-long-tests enable dap long tests
--enable-strict-null-byte-header-padding
enable strict null-byte header padding when reading
......@@ -1704,11 +1704,11 @@ Optional Features:
disk space required, but it will be recovered when
tests are complete). See option --with-temp-large to
specify temporary directory
--enable-benchmarks Run benchmarks. This is an experimental feature. You
must fetch sample data files from the Unidata ftp
site to use these benchmarks. The benchmarks are a
bunch of extra tests, which are timed. We use these
tests to check netCDF performance.
--enable-benchmarks Run benchmarks. This will cause sample data files
from the Unidata ftp site to be fetched. The
benchmarks are a bunch of extra tests, which are
timed. We use these tests to check netCDF
performance.
--disable-extreme-numbers
don't use extreme numbers during testing, such as
MAX_INT - 1
......@@ -1728,10 +1728,10 @@ Optional Features:
conversion causes NC_ERANGE error. [default:
disabled]
--disable-zero-length-coord-bound
Disable a more relaxed boundary error check
NC_EINVALCOORDS to allow coordinate start argument
equal to dimension size when argument count is zero.
[default: enabled]
Disable relaxed boundary error check. Deprecated.
Using this can cause API incompatibilities. This
option will be removed in the next release of
netCDF.
--enable-jna enable jna bug fix
--enable-metadata-perf Test performance of nc_create and nc_open on large
metadata
......@@ -1871,7 +1871,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
netCDF configure 4.6.2
netCDF configure 4.6.2.1
generated by GNU Autoconf 2.69
 
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2580,7 +2580,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
 
It was created by netCDF $as_me 4.6.2, which was
It was created by netCDF $as_me 4.6.2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
$ $0 $@
......@@ -2939,7 +2939,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
NC_VERSION_MAJOR=4
NC_VERSION_MINOR=6
NC_VERSION_PATCH=2
NC_VERSION_NOTE=""
NC_VERSION_NOTE=".1"
 
#####
# Set some variables used to generate a libnetcdf.settings file,
......@@ -2948,11 +2948,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
# Create the VERSION file, which contains the package version from
# AC_INIT.
echo 4.6.2>VERSION
echo 4.6.2.1>VERSION
 
 
{ $as_echo "$as_me:${as_lineno-$LINENO}: netCDF 4.6.2" >&5
$as_echo "$as_me: netCDF 4.6.2" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: netCDF 4.6.2.1" >&5
$as_echo "$as_me: netCDF 4.6.2.1" >&6;}
 
# Keep libtool macros in an m4 directory.
 
......@@ -3616,7 +3616,7 @@ fi
 
# Define the identity of the package.
PACKAGE='netcdf-c'
VERSION='4.6.2'
VERSION='4.6.2.1'
 
 
cat >>confdefs.h <<_ACEOF
......@@ -4339,7 +4339,6 @@ if test "${enable_netcdf_4+set}" = set; then :
fi
 
test "x$enable_netcdf_4" = xno || enable_netcdf_4=yes
enable_hdf5=enable_netcdf_4
 
# Synonym
# Check whether --enable-netcdf4 was given.
......@@ -4354,6 +4353,22 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_netcdf_4" >&5
$as_echo "$enable_netcdf_4" >&6; }
 
# Does the user want to use HDF5?
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we should build with HDF5" >&5
$as_echo_n "checking whether we should build with HDF5... " >&6; }
#enable_hdf5=$enable_netcdf_4
# Check whether --enable-hdf5 was given.
if test "${enable_hdf5+set}" = set; then :
enableval=$enable_hdf5;
fi
test "x$enable_hdf5" = xno || enable_hdf5=yes
if test "x$enable_netcdf_4" = xno ; then
enable_hdf5=no
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_hdf5" >&5
$as_echo "$enable_hdf5" >&6; }
# Does the user require dynamic loading?
# This is only for those hdf5 installs that support it.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking do we require hdf5 dynamic-loading support" >&5
......@@ -5789,28 +5804,6 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_dap_auth_tests" >&5
$as_echo "$enable_dap_auth_tests" >&6; }
 
# Control if groups are supported in [netcdf4]dap2 code
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether netcdf4 group names for DAP2 should be enabled (default on)" >&5
$as_echo_n "checking whether netcdf4 group names for DAP2 should be enabled (default on)... " >&6; }
# Check whether --enable-dap-groups was given.
if test "${enable_dap_groups+set}" = set; then :
enableval=$enable_dap_groups;
fi
test "x$enable_dap_groups" = xno || enable_dap_groups=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_dap_groups" >&5
$as_echo "$enable_dap_groups" >&6; }
if test "x$enable_dap" = "xno" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: DAP2 groups is being disabled because DAP2 support is disabled or netcdf-4 disabled" >&5
$as_echo "$as_me: DAP2 groups is being disabled because DAP2 support is disabled or netcdf-4 disabled" >&6;}
enable_dap_groups=no
fi
if test "x$enable_dap_groups" = xyes; then
$as_echo "#define ENABLE_DAP_GROUPS 1" >>confdefs.h
fi
# Did the user specify a list of test servers to try for remote tests?
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which remote test server(s) to use" >&5
$as_echo_n "checking which remote test server(s) to use... " >&6; }
......@@ -6079,8 +6072,8 @@ $as_echo "#define LARGE_FILE_TESTS 1" >>confdefs.h
fi
 
# Does the user want to run benchmarks?
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether benchmarks should be run (experimental)" >&5
$as_echo_n "checking whether benchmarks should be run (experimental)... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether benchmarks should be run" >&5
$as_echo_n "checking whether benchmarks should be run... " >&6; }
# Check whether --enable-benchmarks was given.
if test "${enable_benchmarks+set}" = set; then :
enableval=$enable_benchmarks;
......@@ -16068,7 +16061,8 @@ done
 
 
# disable dap4 if netcdf-4 is disabled
if test "x$enable_netcdf_4" = "xno" ; then
#if test "x$enable_netcdf_4" = "xno" ; then
if test "x$enable_hdf5" = "xno" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: netcdf-4 not enabled; disabling DAP4" >&5
$as_echo "$as_me: WARNING: netcdf-4 not enabled; disabling DAP4" >&2;}
enable_dap4=no
......@@ -16107,6 +16101,7 @@ test "x$enable_mmap" = xyes || enable_mmap=no
$as_echo "$enable_mmap" >&6; }
 
# check for mmap and mremap availability before committing to use mmap
have_mmap="$enable_mmap"
for ac_func in mmap
do :
ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
......@@ -16114,7 +16109,7 @@ if test "x$ac_cv_func_mmap" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_MMAP 1
_ACEOF
have_mmap=yes
else
have_mmap=no
fi
......@@ -16127,19 +16122,41 @@ if test "x$ac_cv_func_mremap" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_MREMAP 1
_ACEOF
have_mremap=yes
else
have_mremap=no
have_mmap=no
fi
done
 
 
if test "x$have_mmap" != xyes ; then
echo "mmap function is not available: disabling mmap"
enable_mmap=no
# Check for MAP_ANONYMOUS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/mman.h>
int
main ()
{
int x = MAP_ANONYMOUS;
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
havemapanon=yes
else
havemapanon=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether MAP_ANONYMOUS is defined" >&5
$as_echo_n "checking whether MAP_ANONYMOUS is defined... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${havemapanon}" >&5
$as_echo "${havemapanon}" >&6; }
if test "x$havemapanon" != xyes ; then
have_mmap=no
fi
if test "x$have_mremap" != xyes ; then
echo "mremap function is not available: disabling mmap"
if test "x$have_mmap" != xyes ; then
echo "mmap functionality is not available: disabling mmap"
enable_mmap=no
fi
 
......@@ -17850,11 +17867,15 @@ fi
 
if test "x$enable_netcdf_4" = xyes; then
 
$as_echo "#define USE_NETCDF4 1" >>confdefs.h
fi
 
$as_echo "#define USE_HDF5 1" >>confdefs.h
hdf5_parallel=no
if test "x$enable_hdf5" = xyes; then
 
 
$as_echo "#define USE_NETCDF4 1" >>confdefs.h
$as_echo "#define USE_HDF5 1" >>confdefs.h
 
 
$as_echo "#define H5_USE_16_API 1" >>confdefs.h
......@@ -18004,7 +18025,6 @@ _ACEOF
fi
done
 
hdf5_parallel=no
 
# H5Pset_fapl_mpiposix and H5Pget_fapl_mpiposix have been removed since HDF5 1.8.12.
# Use H5Pset_fapl_mpio and H5Pget_fapl_mpio, instead.
......@@ -18020,15 +18040,6 @@ _ACEOF
fi
done
 
# The user may have parallel HDF5 based on MPI POSIX.
# if test "x$ac_cv_func_H5Pget_fapl_mpiposix" = xyes; then
# AC_DEFINE([USE_PARALLEL_POSIX], [1], [if true, compile in parallel netCDF-4 based on MPI/POSIX])
# fi
# The user may have parallel HDF5 based on MPI mumble mumble.
# if test "x$ac_cv_func_H5Pget_fapl_mpio" = xyes; then
# AC_DEFINE([USE_PARALLEL_MPIO], [1], [if true, compile in parallel netCDF-4 based on MPI/IO])
# fi
 
# Check to see if HDF5 library has collective metadata APIs, (HDF5 >= 1.10.0)
if test "x$ac_cv_func_H5Pset_all_coll_metadata_ops" = xyes; then
......@@ -18038,7 +18049,6 @@ $as_echo "#define HDF5_HAS_COLL_METADATA_OPS 1" >>confdefs.h
fi
 
# If parallel is available in hdf5, enable it in the C code. Also add some stuff to netcdf.h.
hdf5_parallel=no
if test "x$ac_cv_func_H5Pget_fapl_mpio" = xyes -o "x$ac_cv_func_H5Pget_fapl_mpiposix" = xyes; then
hdf5_parallel=yes
fi
......@@ -18079,6 +18089,8 @@ $as_echo "#define HDF5_HAS_LIBVER_BOUNDS 1" >>confdefs.h
 
fi
 
fi
# If the user wants hdf4 built in, check it out.
if test "x$enable_hdf4" = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_CreateCompress in -ljpeg" >&5
......@@ -18331,7 +18343,6 @@ fi
$as_echo "#define USE_HDF4 1" >>confdefs.h
 
fi
fi
 
# There are several cases for parallelism:
# 1. PnetCDF enabled => we want to parallelism for CDF-1,CDF-2,and CDF-5
......@@ -18340,10 +18351,10 @@ fi
# b. do want to use it for netcdf4
 
# Should we provide parallel io for netcdf-4?
if test "x$enable_netcdf_4" = xyes ; then
if test "x$enable_hdf5" = xyes ; then
# Check whether --enable-parallel4 was given.
if test "${enable_parallel4+set}" = set; then :
enableval=$enable_parallel4; user_set_parallel4=${enableval}
enableval=$enable_parallel4; user_set_parallel4=${enableval}2
fi
 
test "x$enable_parallel4" = xno || enable_parallel4=yes
......@@ -18525,12 +18536,10 @@ fi
 
# Check whether --enable-zero-length-coord-bound was given.
if test "${enable_zero_length_coord_bound+set}" = set; then :
enableval=$enable_zero_length_coord_bound; enable_zero_length_coord_bound=${enableval}
else
enable_zero_length_coord_bound=auto
enableval=$enable_zero_length_coord_bound;
fi
 
test "x$enable_zero_length_coord_bound" = xno || enable_zero_length_coord_bound=yes
 
# check PnetCDF's settings on enable_erange_fill and relax_coord_bound
if test "x$enable_pnetcdf" = xyes; then
......@@ -18627,19 +18636,12 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $relax_coord_bound_pnetcdf" >&5
$as_echo "$relax_coord_bound_pnetcdf" >&6; }
if test "x$enable_zero_length_coord_bound" = xauto ; then
enable_zero_length_coord_bound=$relax_coord_bound_pnetcdf
elif test "$enable_zero_length_coord_bound" != "$relax_coord_bound_pnetcdf"; then
if test "$enable_zero_length_coord_bound" = yes; then
as_fn_error $? "Enabling relax-coord-bound conflicts with PnetCDF setting" "$LINENO" 5
else
as_fn_error $? "Disabling relax-coord-bound conflicts with PnetCDF setting" "$LINENO" 5
fi
if test x"$relax_coord_bound_pnetcdf" != xyes; then
as_fn_error $? "PNetCDF must be built with relax-coord-bound" "$LINENO" 5
fi
else
# default setting
enable_erange_fill=no
enable_zero_length_coord_bound=yes
fi
 
if test "x$enable_zero_length_coord_bound" = xyes; then
......@@ -19237,8 +19239,6 @@ HAS_HDF5=$enable_hdf5
 
HAS_PNETCDF=$enable_pnetcdf
 
HAS_HDF5=$enable_netcdf_4
HAS_LOGGING=$enable_logging
 
HAS_SZLIB=$enable_szlib
......@@ -20184,7 +20184,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by netCDF $as_me 4.6.2, which was
This file was extended by netCDF $as_me 4.6.2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
CONFIG_FILES = $CONFIG_FILES
......@@ -20254,7 +20254,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
netCDF config.status 4.6.2
netCDF config.status 4.6.2.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
 
......
configure.ac
View file @ cd4b842b
......@@ -13,7 +13,7 @@
AC_PREREQ([2.59])
# Initialize with name, version, and support email address.
AC_INIT([netCDF], [4.6.2], [support-netcdf@unidata.ucar.edu], [netcdf-c])
AC_INIT([netCDF], [4.6.2.1], [support-netcdf@unidata.ucar.edu], [netcdf-c])
##
# Prefer an empty CFLAGS variable instead of the default -g -O2.
......@@ -25,7 +25,7 @@ AC_INIT([netCDF], [4.6.2], [support-netcdf@unidata.ucar.edu], [netcdf-c])
AC_SUBST([NC_VERSION_MAJOR]) NC_VERSION_MAJOR=4
AC_SUBST([NC_VERSION_MINOR]) NC_VERSION_MINOR=6
AC_SUBST([NC_VERSION_PATCH]) NC_VERSION_PATCH=2
AC_SUBST([NC_VERSION_NOTE]) NC_VERSION_NOTE=""
AC_SUBST([NC_VERSION_NOTE]) NC_VERSION_NOTE=".1"
#####
# Set some variables used to generate a libnetcdf.settings file,
......@@ -193,7 +193,6 @@ AC_MSG_CHECKING([whether we should build netCDF-4])
AC_ARG_ENABLE([netcdf-4], [AS_HELP_STRING([--disable-netcdf-4],
[do not build with netcdf-4 (else HDF5 and zlib required)])])
test "x$enable_netcdf_4" = xno || enable_netcdf_4=yes
enable_hdf5=enable_netcdf_4
# Synonym
AC_ARG_ENABLE([netcdf4], [AS_HELP_STRING([--disable-netcdf4],
......@@ -204,6 +203,17 @@ enable_netcdf_4=no
fi
AC_MSG_RESULT([$enable_netcdf_4])
# Does the user want to use HDF5?
AC_MSG_CHECKING([whether we should build with HDF5])
#enable_hdf5=$enable_netcdf_4
AC_ARG_ENABLE([hdf5], [AS_HELP_STRING([--disable-hdf5],
[do not build with HDF5])])
test "x$enable_hdf5" = xno || enable_hdf5=yes
if test "x$enable_netcdf_4" = xno ; then
enable_hdf5=no
fi
AC_MSG_RESULT([$enable_hdf5])
# Does the user require dynamic loading?
# This is only for those hdf5 installs that support it.
AC_MSG_CHECKING([do we require hdf5 dynamic-loading support])
......@@ -386,21 +396,6 @@ if test "x$enable_dap_remote_tests" = "xno" ; then
fi
AC_MSG_RESULT($enable_dap_auth_tests)
# Control if groups are supported in [netcdf4]dap2 code
AC_MSG_CHECKING([whether [netcdf4] group names for DAP2 should be enabled (default on)])
AC_ARG_ENABLE([dap-groups],
[AS_HELP_STRING([--disable-dap-groups],
[disable [netcdf4] DAP2 group names])])
test "x$enable_dap_groups" = xno || enable_dap_groups=yes
AC_MSG_RESULT($enable_dap_groups)
if test "x$enable_dap" = "xno" ; then
AC_MSG_NOTICE([DAP2 groups is being disabled because DAP2 support is disabled or netcdf-4 disabled])
enable_dap_groups=no
fi
if test "x$enable_dap_groups" = xyes; then
AC_DEFINE([ENABLE_DAP_GROUPS], [1], [if true, enable DAP group names])
fi
# Did the user specify a list of test servers to try for remote tests?
AC_MSG_CHECKING([which remote test server(s) to use])
AC_ARG_WITH([testservers],
......@@ -541,13 +536,12 @@ if test "x$enable_large_file_tests" = xyes; then
fi
# Does the user want to run benchmarks?
AC_MSG_CHECKING([whether benchmarks should be run (experimental)])
AC_MSG_CHECKING([whether benchmarks should be run])
AC_ARG_ENABLE([benchmarks],
[AS_HELP_STRING([--enable-benchmarks],
[Run benchmarks. This is an experimental feature. You must fetch
sample data files from the Unidata ftp site to use these benchmarks.
The benchmarks are a bunch of extra tests, which are timed. We use these
tests to check netCDF performance.])])
[Run benchmarks. This will cause sample data files from the Unidata ftp
site to be fetched. The benchmarks are a bunch of extra tests, which
are timed. We use these tests to check netCDF performance.])])
test "x$enable_benchmarks" = xyes || enable_benchmarks=no
AC_MSG_RESULT($enable_benchmarks)
AM_CONDITIONAL(BUILD_BENCHMARKS, [test x$enable_benchmarks = xyes])
......@@ -850,7 +844,8 @@ AC_CHECK_FUNCS([strlcat snprintf \
getrlimit gettimeofday fsync MPI_Comm_f2c MPI_Info_f2c])
# disable dap4 if netcdf-4 is disabled
if test "x$enable_netcdf_4" = "xno" ; then
#if test "x$enable_netcdf_4" = "xno" ; then
if test "x$enable_hdf5" = "xno" ; then
AC_MSG_WARN([netcdf-4 not enabled; disabling DAP4])
enable_dap4=no
fi
......@@ -871,15 +866,24 @@ test "x$enable_mmap" = xyes || enable_mmap=no
AC_MSG_RESULT($enable_mmap)
# check for mmap and mremap availability before committing to use mmap
AC_CHECK_FUNCS([mmap],[have_mmap=yes],[have_mmap=no])
AC_CHECK_FUNCS([mremap],[have_mremap=yes],[have_mremap=no])
have_mmap="$enable_mmap"
AC_CHECK_FUNCS([mmap],[],[have_mmap=no])
AC_CHECK_FUNCS([mremap],[],[have_mmap=no])
if test "x$have_mmap" != xyes ; then
echo "mmap function is not available: disabling mmap"
enable_mmap=no
# Check for MAP_ANONYMOUS
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[#include <sys/mman.h>],
[[int x = MAP_ANONYMOUS;]])],
[havemapanon=yes],
[havemapanon=no])
AC_MSG_CHECKING([whether MAP_ANONYMOUS is defined])
AC_MSG_RESULT([${havemapanon}])
if test "x$havemapanon" != xyes ; then
have_mmap=no
fi
if test "x$have_mremap" != xyes ; then
echo "mremap function is not available: disabling mmap"
if test "x$have_mmap" != xyes ; then
echo "mmap functionality is not available: disabling mmap"
enable_mmap=no
fi
......@@ -1004,9 +1008,13 @@ AC_CHECK_LIB([m], [floor], [],
[AC_MSG_ERROR([Can't find or link to the math library.])])
if test "x$enable_netcdf_4" = xyes; then
AC_DEFINE([USE_NETCDF4], [1], [if true, build netCDF-4])
fi
hdf5_parallel=no
if test "x$enable_hdf5" = xyes; then
AC_DEFINE([USE_HDF5], [1], [if true, use HDF5])
AC_DEFINE([USE_NETCDF4], [1], [if true, build netCDF-4])
AC_DEFINE([H5_USE_16_API], [1], [use HDF5 1.6 API])
# Check for the main hdf5 and hdf5_hl library.
......@@ -1018,20 +1026,10 @@ if test "x$enable_netcdf_4" = xyes; then
AC_CHECK_HEADERS([hdf5.h], [], [AC_MSG_ERROR([Compiling a test with HDF5 failed. Either hdf5.h cannot be found, or config.log should be checked for other reason.])])
AC_CHECK_FUNCS([H5Z_SZIP])
hdf5_parallel=no
# H5Pset_fapl_mpiposix and H5Pget_fapl_mpiposix have been removed since HDF5 1.8.12.
# Use H5Pset_fapl_mpio and H5Pget_fapl_mpio, instead.
AC_CHECK_FUNCS([H5Pget_fapl_mpio H5Pset_deflate H5Z_SZIP H5free_memory H5Pset_libver_bounds H5Pset_all_coll_metadata_ops])
# The user may have parallel HDF5 based on MPI POSIX.
# if test "x$ac_cv_func_H5Pget_fapl_mpiposix" = xyes; then
# AC_DEFINE([USE_PARALLEL_POSIX], [1], [if true, compile in parallel netCDF-4 based on MPI/POSIX])
# fi
# The user may have parallel HDF5 based on MPI mumble mumble.
# if test "x$ac_cv_func_H5Pget_fapl_mpio" = xyes; then
# AC_DEFINE([USE_PARALLEL_MPIO], [1], [if true, compile in parallel netCDF-4 based on MPI/IO])
# fi
# Check to see if HDF5 library has collective metadata APIs, (HDF5 >= 1.10.0)
if test "x$ac_cv_func_H5Pset_all_coll_metadata_ops" = xyes; then
......@@ -1039,7 +1037,6 @@ if test "x$enable_netcdf_4" = xyes; then
fi
# If parallel is available in hdf5, enable it in the C code. Also add some stuff to netcdf.h.
hdf5_parallel=no
if test "x$ac_cv_func_H5Pget_fapl_mpio" = xyes -o "x$ac_cv_func_H5Pget_fapl_mpiposix" = xyes; then
hdf5_parallel=yes
fi
......@@ -1070,6 +1067,8 @@ if test "x$enable_netcdf_4" = xyes; then
AC_DEFINE([HDF5_HAS_LIBVER_BOUNDS], [1], [if true, netcdf4 file properties will be set using H5Pset_libver_bounds])
fi
fi
# If the user wants hdf4 built in, check it out.
if test "x$enable_hdf4" = xyes; then
AC_CHECK_LIB([jpeg], [jpeg_CreateCompress], [],
......@@ -1085,7 +1084,6 @@ if test "x$enable_netcdf_4" = xyes; then
AC_CHECK_LIB([jpeg], [jpeg_set_quality], [], [AC_MSG_ERROR([Can't find or link to the jpeg library (required by hdf4). See config.log for errors.])])
AC_DEFINE([USE_HDF4], [1], [if true, use HDF4 too])
fi
fi
# There are several cases for parallelism:
# 1. PnetCDF enabled => we want to parallelism for CDF-1,CDF-2,and CDF-5
......@@ -1094,11 +1092,11 @@ fi
# b. do want to use it for netcdf4
# Should we provide parallel io for netcdf-4?
if test "x$enable_netcdf_4" = xyes ; then
if test "x$enable_hdf5" = xyes ; then
AC_ARG_ENABLE([parallel4],
[AS_HELP_STRING([--disable-parallel4],
[disable parallel I/O for netcdf-4, even if it's enabled in libhdf5])],
[user_set_parallel4=${enableval}])
[user_set_parallel4=${enableval}]2)
test "x$enable_parallel4" = xno || enable_parallel4=yes
# If user wants parallel IO for netCDF-4, make sure HDF5 can provide it.
......@@ -1187,13 +1185,12 @@ AC_ARG_ENABLE([erange_fill],
[enable_erange_fill=${enableval}], [enable_erange_fill=auto]
)
dnl Always build with relaxed coord bound checking, to prevent API
dnl incompatibilities between different installs of netCDF.
AC_ARG_ENABLE([zero-length-coord-bound],
[AS_HELP_STRING([--disable-zero-length-coord-bound],
[Disable a more relaxed boundary error check NC_EINVALCOORDS
to allow coordinate start argument equal to dimension size
when argument count is zero. @<:@default: enabled@:>@])],
[enable_zero_length_coord_bound=${enableval}], [enable_zero_length_coord_bound=auto]
)
[Disable relaxed boundary error check. Deprecated. Using this can cause API incompatibilities. This option will be removed in the next release of netCDF.])])
test "x$enable_zero_length_coord_bound" = xno || enable_zero_length_coord_bound=yes
# check PnetCDF's settings on enable_erange_fill and relax_coord_bound
if test "x$enable_pnetcdf" = xyes; then
......@@ -1223,19 +1220,12 @@ if test "x$enable_pnetcdf" = xyes; then
choke me
#endif]])], [relax_coord_bound_pnetcdf=yes], [relax_coord_bound_pnetcdf=no])
AC_MSG_RESULT([$relax_coord_bound_pnetcdf])
if test "x$enable_zero_length_coord_bound" = xauto ; then
enable_zero_length_coord_bound=$relax_coord_bound_pnetcdf
elif test "$enable_zero_length_coord_bound" != "$relax_coord_bound_pnetcdf"; then
if test "$enable_zero_length_coord_bound" = yes; then
AC_MSG_ERROR([Enabling relax-coord-bound conflicts with PnetCDF setting])
else
AC_MSG_ERROR([Disabling relax-coord-bound conflicts with PnetCDF setting])
fi
if test x"$relax_coord_bound_pnetcdf" != xyes; then
AC_MSG_ERROR([PNetCDF must be built with relax-coord-bound])
fi
else
# default setting
enable_erange_fill=no
enable_zero_length_coord_bound=yes
fi
if test "x$enable_zero_length_coord_bound" = xyes; then
......@@ -1420,7 +1410,6 @@ AC_SUBST(HAS_CDF5,[$enable_cdf5])
AC_SUBST(HAS_HDF4,[$enable_hdf4])
AC_SUBST(HAS_HDF5,[$enable_hdf5])
AC_SUBST(HAS_PNETCDF,[$enable_pnetcdf])
AC_SUBST(HAS_HDF5,[$enable_netcdf_4])
AC_SUBST(HAS_LOGGING, [$enable_logging])
AC_SUBST(HAS_SZLIB,[$enable_szlib])
AC_SUBST(HAS_PARALLEL,[$enable_parallel])
......
dap4_test/CMakeLists.txt
View file @ cd4b842b
# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
# 2015, 2016, 2017, 2018
# University Corporation for Atmospheric Research/Unidata.
# See netcdf-c/COPYRIGHT file for more info.
SET(abs_top_srcdir ${CMAKE_CURRENT_SOURCE_DIR})
remove_definitions(-DDLL_EXPORT)
......@@ -15,6 +22,12 @@ FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE)
IF(ENABLE_DAP_REMOTE_TESTS)
# Change name (add '4') to avoid cmake
# complaint about duplicate targets.
BUILD_BIN_TEST(findtestserver4)
ENDIF()
IF(ENABLE_TESTS)
# Base tests
......@@ -28,12 +41,8 @@ IF(ENABLE_TESTS)
IF(ENABLE_DAP_REMOTE_TESTS)
# Change name (add '4') to avoid cmake
# complaint about duplicate targets.
BUILD_BIN_TEST(findtestserver4)
IF(BUILD_UTILITIES)
add_sh_test(dap4_test test_remote)
#add_sh_test(dap4_test test_remote)
ENDIF(BUILD_UTILITIES)
ENDIF(ENABLE_DAP_REMOTE_TESTS)
ENDIF(ENABLE_TESTS)
......
dap4_test/Makefile.am
View file @ cd4b842b
## This is a automake file, part of Unidata's netCDF package.
# Copyright 2011, see the COPYRIGHT file for more information.
# Copyright 2018, see the COPYRIGHT file for more information.
# This file builds and runs DAP4 tests.
......@@ -46,8 +46,11 @@ test_data.log: test_meta.log
if ENABLE_DAP_REMOTE_TESTS
# Note: This program name was changed to findtestserver4
# to avoid cmake complaint about duplicate targets.
check_PROGRAMS += findtestserver4
noinst_PROGRAMS = findtestserver4
findtestserver4_SOURCES = findtestserver4.c
endif
if ENABLE_DAP_REMOTE_TESTS
if BUILD_UTILITIES
# relies on ncdump
TESTS += test_remote.sh
......