mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-12-15 08:30:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

changes in support of separating HDF5 and libsrc4

Browse Source
This commit is contained in:
Ed Hartnett 2018-11-26 04:31:23 -07:00
parent 730c7bed2b
commit 6dbcc42eb6
5 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -192,7 +192,10 @@ 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
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],
@ -1419,7 +1422,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])

2
hdf4_test/tst_chunk_hdf4.c
View File

@ -9,8 +9,6 @@
#include <config.h>
#include <nc_tests.h>
#include "err_macros.h"
#include <hdf5.h>
#include <H5DSpublic.h>
#include <mfhdf.h>
#define CHUNKEDFILE "ref_chunked.hdf4"

11
include/Makefile.am
View File

@ -6,23 +6,18 @@
# Ed Hartnett, Dennis Heimbigner, Ward Fisher
include_HEADERS = netcdf.h netcdf_meta.h
include_HEADERS = netcdf.h netcdf_meta.h netcdf_mem.h netcdf_aux.h
if BUILD_PARALLEL
include_HEADERS += netcdf_par.h
endif
include_HEADERS += netcdf_mem.h netcdf_aux.h
noinst_HEADERS = nc_logging.h nc_tests.h fbits.h nc.h nclist.h \
ncuri.h ncutf8.h ncdispatch.h ncdimscale.h netcdf_f.h err_macros.h \
ncbytes.h nchashmap.h ceconstraints.h rnd.h nclog.h ncconfigure.h \
nc4internal.h nctime.h nc3internal.h onstack.h ncrc.h ncauth.h \
ncoffsets.h nctestserver.h nc4dispatch.h nc3dispatch.h ncexternl.h \
ncwinpath.h ncfilter.h ncindex.h hdf4dispatch.h hdf5internal.h
if USE_DAP
noinst_HEADERS += ncdap.h
endif
ncwinpath.h ncfilter.h ncindex.h hdf4dispatch.h hdf5internal.h \
ncdap.h
EXTRA_DIST = CMakeLists.txt XGetopt.h netcdf_meta.h.in

15
include/ncdimscale.h
View File

@ -1,8 +1,11 @@
/* This is part of the netCDF package.
Copyright 2011 University Corporation for Atmospheric Research/Unidata
See COPYRIGHT file for conditions of use.
Includes for some HDF5 stuff needed by tests.
/* Copyright 2005-2018 University Corporation for Atmospheric
Research/Unidata. */
/**
* @file
* @internal Includes for some HDF5 stuff needed by libhdf5 code and
* also some h5_test tests.
*
* @author Ed Hartnett
*/
#ifndef _NCDIMSCALE_H_
@ -10,6 +13,8 @@
#include <hdf5.h>
/* This is used to uniquely identify datasets, so we can keep track of
* dimscales. */
typedef struct hdf5_objid
{
unsigned long fileno[2]; /* file number */

5
include/nchashmap.h
View File

@ -6,6 +6,11 @@
#ifndef NCHASHMAP_H
#define NCHASHMAP_H
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdint.h>
/*
This hashmap is optimized to assume null-terminated strings as the
key.