mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-02-17 16:50:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge in trunk changes to eliminate call to H5close. Update some of the

Browse Source 
configure --help output for nccopy, --enable-c-only option.
This commit is contained in:
Russ Rew 2010-09-15 15:25:20 +00:00
commit 08db2ae283
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -576,7 +576,7 @@ AC_MSG_RESULT([$enable_compiler_recover])
AC_MSG_CHECKING([whether only the C library is desired])
AC_ARG_ENABLE([c-only],
[AS_HELP_STRING([--enable-c-only],
[build only the netCDF-3 C library; same as \
[build only the netCDF C library; same as \
--disable-f77 --disable-cxx --disable-v2 --disable-examples \
--disable-utilities])])
test "x$enable_c_only" = xyes || enable_c_only=no
@ -705,11 +705,11 @@ if test "x$nc_build_v2" = xno; then
AC_DEFINE_UNQUOTED(NO_NETCDF_2, 1, [do not build the netCDF version 2 API])
fi
# Does the user want to disable ncgen/ncdump?
AC_MSG_CHECKING([whether the ncgen/ncdump should be built])
# Does the user want to disable ncgen/ncdump/nccopy?
AC_MSG_CHECKING([whether the ncgen/ncdump/nccopy should be built])
AC_ARG_ENABLE([utilities],
[AS_HELP_STRING([--disable-utilities],
[don't build netCDF utilities ncgen and ncdump])])
[don't build netCDF utilities ncgen, ncdump, and nccopy])])
test "x$nc_build_c" = xno && enable_utilities=no
test "x$enable_utilities" = xno && nc_build_utilities=no
AC_MSG_RESULT($nc_build_utilities)

4
libsrc4/nc4file.c
View File

@ -2702,8 +2702,8 @@ NC4_close(int ncid)
{
/* If all files have been closed, close he HDF5 library. This will
* clean up some stuff that HDF5 is leaving open. */
if ((retval = H5close()) < 0)
return NC_EHDFERR;
/* if ((retval = H5close()) < 0)
return NC_EHDFERR;*/
/* Reset the ncid numbers. */
nc4_file_list_free();