diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-01-12 01:49:41 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-01-12 01:49:41 (GMT) |
| commit | ac8263fcc7cf5e8aafccbebadafb92c4ce6505a8 (patch) | |
| tree | ecfd893a79f9d9b6981abbf6c295bfc8f750ce91 /tools/h5format_convert | |
| parent | 994401b905680598db47e154e5123b8838f1f1c8 (diff) | |
| download | hdf5-ac8263fcc7cf5e8aafccbebadafb92c4ce6505a8.zip hdf5-ac8263fcc7cf5e8aafccbebadafb92c4ce6505a8.tar.gz hdf5-ac8263fcc7cf5e8aafccbebadafb92c4ce6505a8.tar.bz2 | |
[svn-r28859] Merge of r28762, 28770-82, 28791-28806, 28816-28836, 28857
from revise_chunks.
This is basically all the revise_chunks changes since alpha0
aside from the v2 B-tree changes that cause SWMR to fail.
This merge should also bring the alpha branch in sync with
the trunk.
Tested on: 64-bit Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1
autotools serial w/ C++ and Fortran
autotools parallel w/ Fortran (MPICH 3.1.4)
cmake serial (cmakehdf5) w/ C++ and Fortran
Diffstat (limited to 'tools/h5format_convert')
| -rw-r--r-- | tools/h5format_convert/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/h5format_convert/Makefile.in b/tools/h5format_convert/Makefile.in index d192622..a1842e7 100644 --- a/tools/h5format_convert/Makefile.in +++ b/tools/h5format_convert/Makefile.in @@ -528,10 +528,10 @@ LL_PATH = @LL_PATH@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ -LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MEMORYALLOCSANITYCHECK = @MEMORYALLOCSANITYCHECK@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ NM = @NM@ |