Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Combined pull requests #1249

Closed
wants to merge 51 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
0db7b87
Remove // style comments from source code.
DennisHeimbigner Nov 16, 2018
4bb92b7
Fix error report coming out of nc4info.c
DennisHeimbigner Nov 16, 2018
9357723
Merge branch 'master' into gh1207.dmh
WardF Nov 19, 2018
c824ad9
further removal of libhdf5 code from libsrc4
edhartnett Nov 28, 2018
02469ed
updated libnetcdf.settings.in and changing makefile.am to adjust to p…
edhartnett Nov 28, 2018
1d7a9ca
removed HDF5 finalize from libsrc4 code
edhartnett Nov 28, 2018
5d60ca1
trying to fix classic build problem
edhartnett Nov 29, 2018
d51b221
move setting of var chunk cache to libhdf5
edhartnett Nov 29, 2018
104b4b5
clean up
edhartnett Nov 29, 2018
e55b9d6
separation of libhdf5 from libsrc4
edhartnett Nov 29, 2018
4334997
moved special att reading function to libhdf5
edhartnett Nov 30, 2018
77d0922
starting to deal with normalized name in HDF5 attribute code
edhartnett Nov 30, 2018
d0587c9
more name normalization
edhartnett Nov 30, 2018
34c4298
Merge branch 'master' into fixcomments.dmh
WardF Nov 30, 2018
b5ed407
better handling of normalizing names in HDF5 atts
edhartnett Nov 30, 2018
f6443bc
rest of separation of libhdf5 and libsrc4
edhartnett Nov 30, 2018
db83d0b
got disable-hdf5 builds working without utils
edhartnett Dec 1, 2018
bbfbd98
test and util changes to split libsrc4 and libhdf5
edhartnett Dec 1, 2018
5a268e3
Merge branch 'master' into fixcomments.dmh
WardF Dec 4, 2018
dccc644
Modifying COPYRIGHT to reflect a standardized license, the BSD 3-clau…
WardF Dec 4, 2018
817ec9d
Updated release notes to reflect the license change.
WardF Dec 4, 2018
991dbab
Removed old directory in support of https://github.com/Unidata/netcdf…
WardF Dec 4, 2018
3c59fb8
Updating files to refer to the top-level COPYRIGHT file.
WardF Dec 4, 2018
a3eb21c
Continuing to replace references.
WardF Dec 4, 2018
e5640d9
Updated copyright date.
WardF Dec 5, 2018
30d63bb
Fix failings of nc_test/run_inmemory.sh
DennisHeimbigner Dec 5, 2018
1a75313
Make the netcdf-c library compile with gcc -ansi.
DennisHeimbigner Dec 6, 2018
5be0126
More standardizing of the copyright stanza.
WardF Dec 6, 2018
c70480d
Updated COPYRIGHT stanza in libdap2
WardF Dec 6, 2018
72d56fb
Updated copyright stanza in libdap4
WardF Dec 6, 2018
2541788
Updated libdispatch/ files with copyright notice.
WardF Dec 6, 2018
8711013
More synchronization of copyright stanzas.
WardF Dec 6, 2018
763750f
More copyright stanza updates.
WardF Dec 6, 2018
462ec93
Whew! Updated copyright stanza in nc_test4.
WardF Dec 6, 2018
02937d2
ncdump, other directories updated with copyright stanza.
WardF Dec 6, 2018
7fd7696
ncgen directory updated
WardF Dec 6, 2018
7112422
ncgen3 copyright stanzas updated.
WardF Dec 6, 2018
921a217
nctest, oc2 files updated.
WardF Dec 6, 2018
05818ac
Misc. files updated with copyright stanza.
WardF Dec 6, 2018
e9f617e
Testing a fix for a failure I observed.
WardF Dec 7, 2018
d135fb4
Removed confounding text from a reference file, turned on filter test…
WardF Dec 7, 2018
7af0e32
Fixed issue with make distclean
WardF Dec 7, 2018
221ac43
Turned off filter testing for the moment, in appveyor.
WardF Dec 10, 2018
6deb77b
Merge branch 'master' into gh1207.dmh
WardF Dec 11, 2018
1dcb4bc
Merge remote-tracking branch 'origin/fixcomments.dmh' into pr-aggrega…
WardF Dec 11, 2018
beae580
Merge branch 'ejh_next_20' of https://github.com/NetCDF-World-Dominat…
WardF Dec 11, 2018
c17008b
Merge branch 'ejh_next_22' of https://github.com/NetCDF-World-Dominat…
WardF Dec 11, 2018
c8a5b9c
Merge branch 'ejh_next_23' of https://github.com/NetCDF-World-Dominat…
WardF Dec 11, 2018
f06740a
Merge remote-tracking branch 'origin/gh1233.dmh' into pr-aggregation.wif
WardF Dec 11, 2018
f6fbaf2
Merge remote-tracking branch 'origin/ansifix.dmh' into pr-aggregation…
WardF Dec 11, 2018
93972a7
Merge branch 'license_update.wif' into pr-aggregation.wif
WardF Dec 11, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 8 additions & 2 deletions CMakeInstallation.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 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
Expand Down Expand Up @@ -72,7 +78,7 @@ IF(NC_DPKG)
ENDMACRO(getdpkg_arch)
getdpkg_arch(dpkg_arch)

SET(CPACK_DEBIAN_PACKAGE_NAME "netcdf4-dev")
SET(CPACK_DEBIAN_PACKAGE_NAME "netcdf4-dev")
SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "${dpkg_arch}")
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "zlib1g (>= 1:1.2.3.4), libhdf5-7 (>= 1.8.11), libcurl4-openssl-dev (>= 7.22.0)")
ENDIF()
Expand Down Expand Up @@ -127,4 +133,4 @@ set(CPACK_COMPONENT_DEPENDENCIES_DESCRIPTION
set(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION
"The NetCDF-C user documentation.")

INCLUDE(CPack)
INCLUDE(CPack)
13 changes: 9 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1150,8 +1150,8 @@ 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" ON)
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 "")
ENDIF()
Expand Down Expand Up @@ -1408,8 +1408,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()

Expand Down
40 changes: 6 additions & 34 deletions COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1,39 +1,11 @@
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.
8 changes: 7 additions & 1 deletion CTestConfig.cmake.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
## 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.
##
Expand Down
6 changes: 6 additions & 0 deletions CTestCustom.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 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:
##
Expand Down
6 changes: 6 additions & 0 deletions FixBundle.cmake.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 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
Expand Down
6 changes: 5 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ This file contains a high-level description of this package's evolution. Release

## 4.6.3 - TBD

* 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][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
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 6 additions & 0 deletions cmake_uninstall.cmake.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 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")
Expand Down
10 changes: 10 additions & 0 deletions config.h.cmake.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
/*! \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

Expand Down
87 changes: 49 additions & 38 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,6 @@ 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
AC_MSG_CHECKING([whether we should build with HDF5])
AC_MSG_RESULT([$enable_hdf5])

# Synonym
AC_ARG_ENABLE([netcdf4], [AS_HELP_STRING([--disable-netcdf4],
[(just a synonym for --disable-netcdf-4)])])
Expand All @@ -206,6 +202,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])
Expand Down Expand Up @@ -852,7 +859,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
Expand All @@ -873,15 +881,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

Expand Down Expand Up @@ -1006,9 +1023,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.
Expand All @@ -1020,28 +1041,17 @@ 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
AC_DEFINE([HDF5_HAS_COLL_METADATA_OPS], [1], [if true, use collective metadata ops in parallel netCDF-4])
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
Expand Down Expand Up @@ -1072,21 +1082,22 @@ 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

# If the user wants hdf4 built in, check it out.
if test "x$enable_hdf4" = xyes; then
AC_CHECK_LIB([jpeg], [jpeg_CreateCompress], [],
[AC_MSG_ERROR([Jpeg library required for --enable-hdf4 builds.])])
AC_CHECK_HEADERS([mfhdf.h], [], [nc_mfhdf_h_missing=yes])
if test "x$nc_mfhdf_h_missing" = xyes; then
AC_MSG_ERROR([Cannot find mfhdf.h, yet --enable-hdf4 was used.])
fi
AC_CHECK_LIB([df], [Hclose], [], [AC_MSG_ERROR([Can't find or link to the hdf4 df library. See config.log for errors.])])
AC_CHECK_LIB([mfhdf], [NC_arrayfill], [AC_MSG_ERROR([HDF4 library must be built with --disable-netcdf.])], [])
AC_CHECK_LIB([mfhdf], [SDcreate], [], [AC_MSG_ERROR([Can't find or link to the hdf4 mfhdf library. See config.log for errors.])])
fi

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])
# If the user wants hdf4 built in, check it out.
if test "x$enable_hdf4" = xyes; then
AC_CHECK_LIB([jpeg], [jpeg_CreateCompress], [],
[AC_MSG_ERROR([Jpeg library required for --enable-hdf4 builds.])])
AC_CHECK_HEADERS([mfhdf.h], [], [nc_mfhdf_h_missing=yes])
if test "x$nc_mfhdf_h_missing" = xyes; then
AC_MSG_ERROR([Cannot find mfhdf.h, yet --enable-hdf4 was used.])
fi
AC_CHECK_LIB([df], [Hclose], [], [AC_MSG_ERROR([Can't find or link to the hdf4 df library. See config.log for errors.])])
AC_CHECK_LIB([mfhdf], [NC_arrayfill], [AC_MSG_ERROR([HDF4 library must be built with --disable-netcdf.])], [])
AC_CHECK_LIB([mfhdf], [SDcreate], [], [AC_MSG_ERROR([Can't find or link to the hdf4 mfhdf library. See config.log for errors.])])

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

# There are several cases for parallelism:
Expand All @@ -1096,7 +1107,7 @@ 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])],
Expand Down
7 changes: 7 additions & 0 deletions dap4_test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# 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)
Expand Down
2 changes: 1 addition & 1 deletion dap4_test/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## 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.

Expand Down
7 changes: 7 additions & 0 deletions dap4_test/baseline/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# 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.

FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)

Expand Down
7 changes: 7 additions & 0 deletions dap4_test/baselineraw/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# 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.

FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)

Expand Down
7 changes: 7 additions & 0 deletions dap4_test/baselineremote/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# 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.

FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)

Expand Down
Loading