[svn-r24336] Bring revisions #24118 - #24200 from trunk.

24 files changed, 147 insertions, 156 deletions

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 4af6d74..5b9568a 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -256,6 +256,7 @@ LIPO = @LIPO@
 LL_PATH = @LL_PATH@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_ADD_LIBHDF5_DEPENDENCY = @LT_ADD_LIBHDF5_DEPENDENCY@
 LT_STATIC_EXEC = @LT_STATIC_EXEC@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in
index 3278f80..b922c9b 100644
--- a/tools/h5copy/Makefile.in
+++ b/tools/h5copy/Makefile.in
@@ -262,6 +262,7 @@ LIPO = @LIPO@
 LL_PATH = @LL_PATH@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_ADD_LIBHDF5_DEPENDENCY = @LT_ADD_LIBHDF5_DEPENDENCY@
 LT_STATIC_EXEC = @LT_STATIC_EXEC@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 9b46f4e..1b732b0 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -269,6 +269,7 @@ LIPO = @LIPO@
 LL_PATH = @LL_PATH@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_ADD_LIBHDF5_DEPENDENCY = @LT_ADD_LIBHDF5_DEPENDENCY@
 LT_STATIC_EXEC = @LT_STATIC_EXEC@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c
index b8e46f3..cf46e74 100644
--- a/tools/h5diff/h5diff_common.c
+++ b/tools/h5diff/h5diff_common.c
@@ -15,6 +15,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include "H5private.h"
 #include "h5diff.h"
 #include "h5diff_common.h"
 #include "h5tools.h"
@@ -135,7 +136,7 @@ void parse_command_line(int argc,
                     options->m_verbose_level = 0;
                     break;
             }
-                else if (!strncmp (argv[i], "-v", 2))
+                else if (!strncmp (argv[i], "-v", (size_t)2))
             {
                     options->m_verbose_level = atoi(&argv[i][2]);
                     break;
@@ -149,7 +150,7 @@ void parse_command_line(int argc,
                     options->m_verbose_level = 0;
                     break;
             }
-            else if ( !strncmp (argv[i], "--verbose", 9) && argv[i][9]=='=')
+            else if ( !strncmp (argv[i], "--verbose", (size_t)9) && argv[i][9]=='=')
             {
                     options->m_verbose_level = atoi(&argv[i][10]);
                     break;
@@ -164,7 +165,7 @@ void parse_command_line(int argc,
             options->m_report = 1;
             break;
         case 'l':
-            options->follow_links = 1;
+            options->follow_links = TRUE;
             break;
         case 'x':
             options->no_dangle_links = 1;
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 4741683..21a622d 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -268,6 +268,7 @@ LIPO = @LIPO@
 LL_PATH = @LL_PATH@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_ADD_LIBHDF5_DEPENDENCY = @LT_ADD_LIBHDF5_DEPENDENCY@
 LT_STATIC_EXEC = @LT_STATIC_EXEC@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
diff --git a/tools/h5dump/errfiles/filter_fail.err b/tools/h5dump/errfiles/filter_fail.err
index 8f0f990..db21044 100644
--- a/tools/h5dump/errfiles/filter_fail.err
+++ b/tools/h5dump/errfiles/filter_fail.err
@@ -14,6 +14,9 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #004: (file name) line (number) in H5Z_pipeline(): required filter 'filter_fail_test' is not registered
     major: Data filters
     minor: Read failed
+  #005: (file name) line (number) in H5PL_load(): required dynamically loaded plugin filter '312' is not available
+    major: Plugin for dynamically loaded library
+    minor: Unable to load metadata into cache
 h5dump error: unable to print data
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
   #000: (file name) line (number) in h5tools_dump_simple_dset(): H5Dread failed
diff --git a/tools/h5dump/h5dump_ddl.c b/tools/h5dump/h5dump_ddl.c
index 6aaa499..d714f39 100644
--- a/tools/h5dump/h5dump_ddl.c
+++ b/tools/h5dump/h5dump_ddl.c
@@ -1154,6 +1154,9 @@ dump_fcpl(hid_t fid)
     hsize_t  userblock; /* userblock size retrieved from FCPL */
     size_t   off_size;  /* size of offsets in the file */
     size_t   len_size;  /* size of lengths in the file */
+    H5F_file_space_type_t  fs_strategy;  /* file space strategy */
+    hsize_t  fs_threshold;    /* free-space section threshold */
+    H5F_info2_t finfo;  /* file information */
 #ifdef SHOW_FILE_DRIVER
     hid_t    fapl;      /* file access property list ID */
     hid_t    fdriver;   /* file driver */
@@ -1162,9 +1165,6 @@ dump_fcpl(hid_t fid)
     unsigned sym_lk;    /* symbol table B-tree leaf 'K' value */
     unsigned sym_ik;    /* symbol table B-tree internal 'K' value */
     unsigned istore_ik; /* indexed storage B-tree internal 'K' value */
-    H5F_file_space_type_t  fs_strategy;  /* file space strategy */
-    hsize_t  fs_threshold;    /* free-space section threshold */
-    H5F_info2_t finfo;  /* file information */
 
     fcpl=H5Fget_create_plist(fid);
     H5Fget_info2(fid, &finfo);
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 9ad2341..bfb777a 100644
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -262,6 +262,7 @@ LIPO = @LIPO@
 LL_PATH = @LL_PATH@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_ADD_LIBHDF5_DEPENDENCY = @LT_ADD_LIBHDF5_DEPENDENCY@
 LT_STATIC_EXEC = @LT_STATIC_EXEC@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index fd170fd..7256d6e 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -276,6 +276,7 @@ LIPO = @LIPO@
 LL_PATH = @LL_PATH@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_ADD_LIBHDF5_DEPENDENCY = @LT_ADD_LIBHDF5_DEPENDENCY@
 LT_STATIC_EXEC = @LT_STATIC_EXEC@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index 1861b03..d67249f 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -256,6 +256,7 @@ LIPO = @LIPO@
 LL_PATH = @LL_PATH@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_ADD_LIBHDF5_DEPENDENCY = @LT_ADD_LIBHDF5_DEPENDENCY@
 LT_STATIC_EXEC = @LT_STATIC_EXEC@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index d4e1cb3..6295ffb 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -1461,13 +1461,13 @@ dump_dataset_values(hid_t dset)
     /* Print all the values. */
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "    Data:\n");
-    h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+    h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
     ctx.need_prefix = TRUE;
     ctx.cur_column = (size_t)curr_pos;
     if (h5tools_dump_dset(rawoutstream, info, &ctx, dset, -1, NULL) < 0) {
         h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer, "        Unable to print data.");
-        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
     }
 
     H5Tclose(f_type);
@@ -1535,7 +1535,7 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t UNUSED *ainfo,
             case H5S_SCALAR:
                 /* scalar dataspace */
                 h5tools_str_append(&buffer, " scalar\n");
-                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
                 break;
 
             case H5S_SIMPLE:
@@ -1546,20 +1546,20 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t UNUSED *ainfo,
                     nelmts *= size[i];
                 }
                 h5tools_str_append(&buffer, "}\n");
-                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
                 break;
 
             case H5S_NULL:
                 /* null dataspace */
                 h5tools_str_append(&buffer, " null\n");
-                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
                 break;
 
             case H5S_NO_CLASS:
             default:
                 /* Unknown dataspace type */
                 h5tools_str_append(&buffer, " unknown\n");
-                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
                 break;
         } /* end switch */
 
@@ -1568,7 +1568,7 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t UNUSED *ainfo,
         h5tools_str_append(&buffer, "        Type:      ");
         print_type(&buffer, type, 15);
         h5tools_str_append(&buffer, "\n");
-        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
 
         /* Data */
         outputformat = *info;
@@ -1584,7 +1584,7 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t UNUSED *ainfo,
         else {
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, "        Data:\n");
-            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
             outputformat.line_1st  = NULL;
             outputformat.line_pre  = "            %s ";
             outputformat.line_cont = "            %s  ";
@@ -1720,7 +1720,7 @@ dataset_list1(hid_t dset)
     if (space_type==H5S_SCALAR) h5tools_str_append(&buffer, "SCALAR");
     else if (space_type==H5S_NULL) h5tools_str_append(&buffer, "NULL");
     h5tools_str_append(&buffer, "}");
-    h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+    h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
     H5Sclose (space);
 
     h5tools_str_close(&buffer);
@@ -1787,7 +1787,7 @@ dataset_list2(hid_t dset, const char UNUSED *name)
         if (H5D_CHUNKED==H5Pget_layout(dcpl)) {
             hsize_t     chsize[64];     /* chunk size in elements */
 
-            ndims = H5Pget_chunk(dcpl, NELMTS(chsize), chsize/*out*/);
+            ndims = H5Pget_chunk(dcpl, (int)NELMTS(chsize), chsize/*out*/);
             h5tools_str_append(&buffer, "    %-10s {", "Chunks:");
             total = H5Tget_size(type);
             for (i=0; i<ndims; i++) {
@@ -1905,7 +1905,7 @@ dataset_list2(hid_t dset, const char UNUSED *name)
         h5tools_str_append(&buffer, "    %-10s ", "Type:");
         print_type(&buffer, type, 15);
         h5tools_str_append(&buffer, "\n");
-        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
 
         /* Print address information */
         if(address_g)
@@ -1960,7 +1960,7 @@ datatype_list2(hid_t type, const char UNUSED *name)
         h5tools_str_append(&buffer, "    %-10s ", "Type:");
         print_type(&buffer, type, 15);
         h5tools_str_append(&buffer, "\n");
-        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
 
         h5tools_str_close(&buffer);
     }
@@ -2010,7 +2010,7 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
         h5tools_str_append(&buffer, "{");
     if(obj_type >= 0 && dispatch_g[obj_type].name)
         h5tools_str_append(&buffer, "%s", dispatch_g[obj_type].name);
-    h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+    h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
 
     /* Check if we've seen this object before */
     if(first_seen) {
@@ -2020,7 +2020,7 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
         if(!iter->symlink_target) {
             h5tools_str_append(&buffer, "\n");
         }
-        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
     } /* end if */
     else {
         hid_t obj = (-1);               /* ID of object opened */
@@ -2031,7 +2031,7 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
         if(obj_type >= 0 && (obj = H5Oopen(iter->fid, name, H5P_DEFAULT)) < 0) {
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, " *ERROR*\n");
-            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
             goto done;
         } /* end if */
 
@@ -2041,7 +2041,7 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
         if(!iter->symlink_target || (verbose_g > 0)) {
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, "\n");
-            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
         }
 
         /* Show detailed information about the object, beginning with information
@@ -2059,7 +2059,7 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, "    %-10s %lu:"H5_PRINTF_HADDR_FMT"\n", "Location:", oinfo->fileno, oinfo->addr);
             h5tools_str_append(&buffer, "    %-10s %u\n", "Links:", (unsigned)oinfo->rc);
-            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
 
             /* Modification time */
             if(oinfo->mtime > 0) {
@@ -2074,7 +2074,7 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
                     HDstrftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %Z", tm);
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "    %-10s %s\n", "Modified:", buf);
-                    h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+                    h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
                 } /* end if */
             } /* end if */
 
@@ -2094,7 +2094,7 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
                         h5tools_str_append(&buffer, "    %-10s \"", "Comment:");
                         print_string(&buffer, comment, FALSE);
                         h5tools_str_append(&buffer, "\"\n");
-                        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+                        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
                     } /* end if */
                     HDfree(comment);
                 }
@@ -2114,7 +2114,7 @@ done:
     if(iter->symlink_target) {
         h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer, "}\n");
-        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
         iter->symlink_target = FALSE;
     }
     h5tools_str_close(&buffer);
@@ -2181,7 +2181,7 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
             h5tools_str_append(&buffer, "Soft Link {");
             h5tools_str_append(&buffer, buf);
             h5tools_str_append(&buffer, "}");
-            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
             if(follow_symlink_g)
             {
                 hbool_t orig_grp_literal = grp_literal_g;
@@ -2192,10 +2192,10 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
                 if(symlink_is_visited(iter->symlink_list, linfo->type, NULL, buf)) 
                 {
                     h5tools_str_append(&buffer, "{Already Visited}\n");
-                    h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+                    h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
                     goto done;
                 }
-                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
 
                 /* Add this link to the list of seen softlinks */
                 if(symlink_visit_add(iter->symlink_list, linfo->type, NULL, buf) < 0) 
@@ -2221,7 +2221,7 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
             else {
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "\n");
-                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
             }
 
             break;
@@ -2253,7 +2253,7 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
                 h5tools_str_append(&buffer, "/");
                         h5tools_str_append(&buffer, path);
             h5tools_str_append(&buffer, "}");
-            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
 
             /* Recurse through the external link */
             /* keep the follow_elink_g for backward compatibility with -E */
@@ -2267,10 +2267,10 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
                 if(symlink_is_visited(iter->symlink_list, linfo->type, filename, path)) 
                 {
                     h5tools_str_append(&buffer, "{Already Visited}\n");
-                    h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+                    h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
                     goto done;
                 }
-                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
 
                 /* Add this link to the list of seen elinks */
                 if(symlink_visit_add(iter->symlink_list, linfo->type, filename, path) < 0) 
@@ -2305,7 +2305,7 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
         case H5L_TYPE_MAX:
         default:
             h5tools_str_append(&buffer, "UD Link {cannot follow UD links}\n");
-            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
             break;
     } /* end switch */
 
@@ -2356,7 +2356,7 @@ visit_obj(hid_t file, const char *oname, iter_t *iter)
         }
         else
             print_obj_name(&buffer, iter, oname, "**NOT FOUND**");
-        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
         retval = -1;
         goto done;
     } /* end if */
@@ -2366,7 +2366,7 @@ visit_obj(hid_t file, const char *oname, iter_t *iter)
         /* Get ID for group */
         if(!iter->symlink_target && (iter->gid = H5Gopen2(file, oname, H5P_DEFAULT)) < 0) {
             h5tools_str_append(&buffer, "%s: unable to open '%s' as group\n", iter->fname, oname);
-            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
             goto done;   /* Previously "continue", when this code was in main().
                          * We don't "continue" here in order to close the file
                          * and free the file name properly. */
@@ -2460,7 +2460,7 @@ get_width(void)
     {
         /* Unix with ioctl(TIOCGWINSZ) */
         struct winsize w;
-        if (ioctl(2, TIOCGWINSZ, &w)>=0 && w.ws_col>0)
+        if (ioctl(2, (int)TIOCGWINSZ, &w)>=0 && w.ws_col>0)
             width = w.ws_col;
     }
 #elif defined(H5_HAVE_TIOCGETD) && defined(H5_HAVE_IOCTL)
@@ -2617,9 +2617,9 @@ main(int argc, const char *argv[])
             simple_output_g = TRUE;
         } else if(!HDstrcmp(argv[argno], "--string")) {
             string_g = TRUE;
-        } else if(!HDstrncmp(argv[argno], "--vfd=", 6)) {
+        } else if(!HDstrncmp(argv[argno], "--vfd=", (size_t)6)) {
             preferred_driver = argv[argno]+6;
-        } else if(!HDstrncmp(argv[argno], "--width=", 8)) {
+        } else if(!HDstrncmp(argv[argno], "--width=", (size_t)8)) {
             width_g = (int)HDstrtol(argv[argno]+8, &rest, 0);
 
             if(0 == width_g)
@@ -2647,7 +2647,7 @@ main(int argc, const char *argv[])
             leave(EXIT_SUCCESS);
         } else if(!HDstrcmp(argv[argno], "--hexdump")) {
             hexdump_g = TRUE;
-        } else if(!HDstrncmp(argv[argno], "-w", 2)) {
+        } else if(!HDstrncmp(argv[argno], "-w", (size_t)2)) {
             if(argv[argno][2]) {
                 s = argv[argno] + 2;
             } else if((argno + 1) >= argc) {
@@ -2857,7 +2857,7 @@ main(int argc, const char *argv[])
 
                 h5tools_str_reset(&buffer);
                 print_obj_name(&buffer, &iter, oname, "**NOT FOUND**");
-                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, info->line_ncols, 0, 0);
+                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
                 leave(EXIT_FAILURE);
             } /* end if */
         } /* end if */
diff --git a/tools/h5repack/Makefile.am b/tools/h5repack/Makefile.am
index c52112b..663e501 100644
--- a/tools/h5repack/Makefile.am
+++ b/tools/h5repack/Makefile.am
@@ -30,7 +30,9 @@ noinst_PROGRAMS=testh5repack_detect_szip
 
 SCRIPT_DEPEND=h5repack$(EXEEXT)
 if HAVE_SHARED_CONDITIONAL
-  TEST_SCRIPT += h5repack_plugin.sh
+if USE_PLUGINS_CONDITIONAL
+   TEST_SCRIPT += h5repack_plugin.sh
+endif
 endif
 
 check_SCRIPTS=$(TEST_SCRIPT)
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index addb530..fc37649 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -74,7 +74,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/config/commence.am \
 	$(top_srcdir)/config/conclude.am
 noinst_PROGRAMS = testh5repack_detect_szip$(EXEEXT)
-@HAVE_SHARED_CONDITIONAL_TRUE@am__append_1 = h5repack_plugin.sh
+@HAVE_SHARED_CONDITIONAL_TRUE@@USE_PLUGINS_CONDITIONAL_TRUE@am__append_1 = h5repack_plugin.sh
 check_PROGRAMS = $(am__EXEEXT_1)
 bin_PROGRAMS = h5repack$(EXEEXT)
 TESTS = $(am__EXEEXT_1) $(TEST_SCRIPT)
@@ -312,6 +312,7 @@ LIPO = @LIPO@
 LL_PATH = @LL_PATH@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_ADD_LIBHDF5_DEPENDENCY = @LT_ADD_LIBHDF5_DEPENDENCY@
 LT_STATIC_EXEC = @LT_STATIC_EXEC@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c
index d7bfd02..3815679 100644
--- a/tools/h5repack/h5repack_main.c
+++ b/tools/h5repack/h5repack_main.c
@@ -32,19 +32,30 @@ const char *outfile = NULL;
  * parameters.
  */
 static const char *s_opts = "hVvf:l:m:e:nLc:d:s:u:b:M:t:a:i:o:S:T:";
-static struct long_options l_opts[] = { { "help", no_arg, 'h' }, { "version",
-		no_arg, 'V' }, { "verbose", no_arg, 'v' },
-		{ "filter", require_arg, 'f' }, { "layout", require_arg, 'l' }, {
-				"minimum", require_arg, 'm' }, { "file", require_arg, 'e' }, {
-				"native", no_arg, 'n' }, { "latest", no_arg, 'L' }, { "compact",
-				require_arg, 'c' }, { "indexed", require_arg, 'd' }, { "ssize",
-				require_arg, 's' }, { "ublock", require_arg, 'u' }, { "block",
-				require_arg, 'b' }, { "metadata_block_size", require_arg, 'M' },
-		{ "threshold", require_arg, 't' }, { "alignment", require_arg, 'a' }, {
-				"infile", require_arg, 'i' }, /* -i for backward compability */
-		{ "outfile", require_arg, 'o' }, /* -o for backward compability */
-		{ "fs_strategy", require_arg, 'S' },
-		{ "fs_threshold", require_arg, 'T' }, { NULL, 0, '\0' } };
+static struct long_options l_opts[] = {
+	{ "help", no_arg, 'h' },
+	{ "version", no_arg, 'V' },
+	{ "verbose", no_arg, 'v' },
+	{ "filter", require_arg, 'f' },
+	{ "layout", require_arg, 'l' },
+	{ "minimum", require_arg, 'm' },
+	{ "file", require_arg, 'e' },
+	{ "native", no_arg, 'n' },
+	{ "latest", no_arg, 'L' },
+	{ "compact", require_arg, 'c' },
+	{ "indexed", require_arg, 'd' },
+	{ "ssize", require_arg, 's' },
+	{ "ublock", require_arg, 'u' },
+	{ "block", require_arg, 'b' },
+	{ "metadata_block_size", require_arg, 'M' },
+	{ "threshold", require_arg, 't' },
+	{ "alignment", require_arg, 'a' },
+	{ "infile", require_arg, 'i' }, /* -i for backward compability */
+	{ "outfile", require_arg, 'o' }, /* -o for backward compability */
+	{ "fs_strategy", require_arg, 'S' },
+	{ "fs_threshold", require_arg, 'T' },
+	{ NULL, 0, '\0' }
+};
 
 /*-------------------------------------------------------------------------
  * Function: usage
@@ -61,81 +72,55 @@ static void usage(const char *prog) {
 	printf("  file2                    Output HDF5 File\n");
 	printf("  OPTIONS\n");
 	printf("   -h, --help              Print a usage message and exit\n");
-	printf(
-			"   -v, --verbose           Verbose mode, print object information\n");
+	printf("   -v, --verbose           Verbose mode, print object information\n");
 	printf("   -V, --version           Print version number and exit\n");
-	printf(
-			"   -n, --native            Use a native HDF5 type when repacking\n");
+	printf("   -n, --native            Use a native HDF5 type when repacking\n");
 	printf("   -L, --latest            Use latest version of file format\n");
-	printf(
-			"   -c L1, --compact=L1     Maximum number of links in header messages\n");
-	printf(
-			"   -d L2, --indexed=L2     Minimum number of links in the indexed format\n");
-	printf(
-			"   -s S[:F], --ssize=S[:F] Shared object header message minimum size\n");
-	printf(
-			"   -m M, --minimum=M       Do not apply the filter to datasets smaller than M\n");
-	printf(
-			"   -e E, --file=E          Name of file E with the -f and -l options\n");
-	printf(
-			"   -u U, --ublock=U        Name of file U with user block data to be added\n");
+	printf("   -c L1, --compact=L1     Maximum number of links in header messages\n");
+	printf("   -d L2, --indexed=L2     Minimum number of links in the indexed format\n");
+	printf("   -s S[:F], --ssize=S[:F] Shared object header message minimum size\n");
+	printf("   -m M, --minimum=M       Do not apply the filter to datasets smaller than M\n");
+	printf("   -e E, --file=E          Name of file E with the -f and -l options\n");
+	printf("   -u U, --ublock=U        Name of file U with user block data to be added\n");
 	printf("   -b B, --block=B         Size of user block to be added\n");
-	printf(
-			"   -M A, --metadata_block_size=A  Metadata block size for H5Pset_meta_block_size\n");
+	printf("   -M A, --metadata_block_size=A  Metadata block size for H5Pset_meta_block_size\n");
 	printf("   -t T, --threshold=T     Threshold value for H5Pset_alignment\n");
 	printf("   -a A, --alignment=A     Alignment value for H5Pset_alignment\n");
 	printf("   -f FILT, --filter=FILT  Filter type\n");
 	printf("   -l LAYT, --layout=LAYT  Layout type\n");
-	printf(
-			"   -S FS_STRGY, --fs_strategy=FS_STRGY  File space management strategy\n");
-	printf(
-			"   -T FS_THRD, --fs_threshold=FS_THRD   Free-space section threshold\n");
-
+	printf("   -S FS_STRGY, --fs_strategy=FS_STRGY  File space management strategy\n");
+	printf("   -T FS_THRD, --fs_threshold=FS_THRD   Free-space section threshold\n");
 	printf("\n");
-
-	printf(
-			"    M - is an integer greater than 1, size of dataset in bytes (default is 0) \n");
+	printf("    M - is an integer greater than 1, size of dataset in bytes (default is 0) \n");
 	printf("    E - is a filename.\n");
 	printf("    S - is an integer\n");
 	printf("    U - is a filename.\n");
 	printf("    T - is an integer\n");
 	printf("    A - is an integer greater than zero\n");
-	printf(
-			"    B - is the user block size, any value that is 512 or greater and is\n");
+	printf("    B - is the user block size, any value that is 512 or greater and is\n");
 	printf("        a power of 2 (1024 default)\n");
-	printf(
-			"    F - is the shared object header message type, any of <dspace|dtype|fill|\n");
-	printf(
-			"        pline|attr>. If F is not specified, S applies to all messages\n");
+	printf("    F - is the shared object header message type, any of <dspace|dtype|fill|\n");
+	printf("        pline|attr>. If F is not specified, S applies to all messages\n");
 	printf("\n");
-	printf(
-			"    FS_STRGY is the file space management strategy to use for the output file.\n");
+	printf("    FS_STRGY is the file space management strategy to use for the output file.\n");
 	printf("             It is a string as listed below:\n");
-	printf(
-			"        ALL_PERSIST - Use persistent free-space managers, aggregators and virtual file driver\n");
+	printf("        ALL_PERSIST - Use persistent free-space managers, aggregators and virtual file driver\n");
 	printf("                      for file space allocation\n");
-	printf(
-			"        ALL - Use non-persistent free-space managers, aggregators and virtual file driver\n");
+	printf("        ALL - Use non-persistent free-space managers, aggregators and virtual file driver\n");
 	printf("              for file space allocation\n");
-	printf(
-			"        AGGR_VFD - Use aggregators and virtual file driver for file space allocation\n");
+	printf("        AGGR_VFD - Use aggregators and virtual file driver for file space allocation\n");
 	printf("        VFD - Use virtual file driver for file space allocation\n");
 	printf("\n");
-	printf(
-			"    FS_THRD is the free-space section threshold to use for the output file.\n");
-	printf(
-			"            It is the minimum size (in bytes) of free-space sections to be tracked\n");
+	printf("    FS_THRD is the free-space section threshold to use for the output file.\n");
+	printf("            It is the minimum size (in bytes) of free-space sections to be tracked\n");
 	printf("            by the the library's free-space managers.\n");
 	printf("\n");
-
 	printf("    FILT - is a string with the format:\n");
 	printf("\n");
 	printf("      <list of objects>:<name of filter>=<filter parameters>\n");
 	printf("\n");
-	printf(
-			"      <list of objects> is a comma separated list of object names, meaning apply\n");
-	printf(
-			"        compression only to those objects. If no names are specified, the filter\n");
+	printf("      <list of objects> is a comma separated list of object names, meaning apply\n");
+	printf("        compression only to those objects. If no names are specified, the filter\n");
 	printf("        is applied to all objects\n");
 	printf("      <name of filter> can be:\n");
 	printf("        GZIP, to apply the HDF5 GZIP filter (GZIP compression)\n");
@@ -146,22 +131,17 @@ static void usage(const char *prog) {
 	printf("        SOFF, to apply the HDF5 Scale/Offset filter\n");
 	printf("        UD,   to apply a user defined filter\n");
 	printf("        NONE, to remove all filters\n");
-	printf(
-			"      <filter parameters> is optional filter parameter information\n");
+	printf("      <filter parameters> is optional filter parameter information\n");
 	printf("        GZIP=<deflation level> from 1-9\n");
-	printf(
-			"        SZIP=<pixels per block,coding> pixels per block is a even number in\n");
+	printf("        SZIP=<pixels per block,coding> pixels per block is a even number in\n");
 	printf("            2-32 and coding method is either EC or NN\n");
 	printf("        SHUF (no parameter)\n");
 	printf("        FLET (no parameter)\n");
 	printf("        NBIT (no parameter)\n");
-	printf(
-			"        SOFF=<scale_factor,scale_type> scale_factor is an integer and scale_type\n");
+	printf("        SOFF=<scale_factor,scale_type> scale_factor is an integer and scale_type\n");
 	printf("            is either IN or DS\n");
-	printf(
-			"        UD=<filter_number,cd_value_count,value_1[,value_2,...,value_N]>\n");
-	printf(
-			"            required values for filter_number,cd_value_count,value_1\n");
+	printf("        UD=<filter_number,cd_value_count,value_1[,value_2,...,value_N]>\n");
+	printf("            required values for filter_number,cd_value_count,value_1\n");
 	printf("            optional values for value_2 to value_N\n");
 	printf("        NONE (no parameter)\n");
 	printf("\n");
@@ -169,18 +149,15 @@ static void usage(const char *prog) {
 	printf("\n");
 	printf("      <list of objects>:<layout type>=<layout parameters>\n");
 	printf("\n");
-	printf(
-			"      <list of objects> is a comma separated list of object names, meaning that\n");
-	printf(
-			"        layout information is supplied for those objects. If no names are\n");
+	printf("      <list of objects> is a comma separated list of object names, meaning that\n");
+	printf("        layout information is supplied for those objects. If no names are\n");
 	printf("        specified, the layout type is applied to all objects\n");
 	printf("      <layout type> can be:\n");
 	printf("        CHUNK, to apply chunking layout\n");
 	printf("        COMPA, to apply compact layout\n");
 	printf("        CONTI, to apply contiguous layout\n");
 	printf("      <layout parameters> is optional layout information\n");
-	printf(
-			"        CHUNK=DIM[xDIM...xDIM], the chunk size of each dimension\n");
+	printf("        CHUNK=DIM[xDIM...xDIM], the chunk size of each dimension\n");
 	printf("        COMPA (no parameter)\n");
 	printf("        CONTI (no parameter)\n");
 	printf("\n");
@@ -190,21 +167,18 @@ static void usage(const char *prog) {
 	printf("\n");
 	printf("   GZIP compression with level 1 to all objects\n");
 	printf("\n");
-	printf("2) h5repack -v -f A:SZIP=8,NN file1 file2\n");
+	printf("2) h5repack -v -f dset1:SZIP=8,NN file1 file2\n");
 	printf("\n");
-	printf(
-			"   SZIP compression with 8 pixels per block and NN coding method to object A\n");
+	printf("   SZIP compression with 8 pixels per block and NN coding method to object dset1\n");
 	printf("\n");
-	printf("3) h5repack -v -l A,B:CHUNK=20x10 -f C,D,F:NONE file1 file2\n");
+	printf("3) h5repack -v -l dset1,dset2:CHUNK=20x10 -f dset3,dset4,dset5:NONE file1 file2\n");
 	printf("\n");
-	printf(
-			"   Chunked layout, with a layout size of 20x10, to objects A and B\n");
-	printf("   and remove filters to objects C, D, F\n");
+	printf("   Chunked layout, with a layout size of 20x10, to objects dset1 and dset2\n");
+	printf("   and remove filters to objects dset3, dset4, dset5\n");
 	printf("\n");
 	printf("4) h5repack -L -c 10 -s 20:dtype file1 file2 \n");
 	printf("\n");
-	printf(
-			"   Using latest file format with maximum compact group size of 10 and\n");
+	printf("   Using latest file format with maximum compact group size of 10 and\n");
 	printf("   and minimum shared datatype size of 20\n");
 	printf("\n");
 	printf("5) h5repack -f SHUF -f GZIP=1 file1 file2 \n");
diff --git a/tools/h5repack/h5repack_plugin.sh.in b/tools/h5repack/h5repack_plugin.sh.in
index e8ba83e..a45d1fe 100644
--- a/tools/h5repack/h5repack_plugin.sh.in
+++ b/tools/h5repack/h5repack_plugin.sh.in
@@ -222,7 +222,7 @@ COPY_TESTFILES_TO_TESTDIR
 
 # Run the test
 arg="h5repack_layout.h5 -v -f UD=257,1,9"
-#TOOLTEST_DUMP plugin_test $arg 
+TOOLTEST_DUMP plugin_test $arg 
 
 # print results
 if test $nerrors -ne 0 ; then
diff --git a/tools/h5repack/testfiles/h5repack-help.txt b/tools/h5repack/testfiles/h5repack-help.txt
index 6de1eb4..c70b031 100644
--- a/tools/h5repack/testfiles/h5repack-help.txt
+++ b/tools/h5repack/testfiles/h5repack-help.txt
@@ -98,14 +98,14 @@ Examples of use:
 
    GZIP compression with level 1 to all objects
 
-2) h5repack -v -f A:SZIP=8,NN file1 file2
+2) h5repack -v -f dset1:SZIP=8,NN file1 file2
 
-   SZIP compression with 8 pixels per block and NN coding method to object A
+   SZIP compression with 8 pixels per block and NN coding method to object dset1
 
-3) h5repack -v -l A,B:CHUNK=20x10 -f C,D,F:NONE file1 file2
+3) h5repack -v -l dset1,dset2:CHUNK=20x10 -f dset3,dset4,dset5:NONE file1 file2
 
-   Chunked layout, with a layout size of 20x10, to objects A and B
-   and remove filters to objects C, D, F
+   Chunked layout, with a layout size of 20x10, to objects dset1 and dset2
+   and remove filters to objects dset3, dset4, dset5
 
 4) h5repack -L -c 10 -s 20:dtype file1 file2 
 
diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in
index ec77732..d2c26a2 100644
--- a/tools/h5stat/Makefile.in
+++ b/tools/h5stat/Makefile.in
@@ -291,6 +291,7 @@ LIPO = @LIPO@
 LL_PATH = @LL_PATH@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_ADD_LIBHDF5_DEPENDENCY = @LT_ADD_LIBHDF5_DEPENDENCY@
 LT_STATIC_EXEC = @LT_STATIC_EXEC@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index 743e158..6f7f3b9 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -254,6 +254,7 @@ LIPO = @LIPO@
 LL_PATH = @LL_PATH@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_ADD_LIBHDF5_DEPENDENCY = @LT_ADD_LIBHDF5_DEPENDENCY@
 LT_STATIC_EXEC = @LT_STATIC_EXEC@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 1752155..541525d 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -839,10 +839,10 @@ hsize_t h5diff(const char *fname1,
     {
         h5difftrace("h5diff no object specified\n");
         /* set root group */
-        obj1fullname = (char*)HDcalloc(2, sizeof(char));
+        obj1fullname = (char*)HDcalloc((size_t)2, sizeof(char));
         HDstrcat(obj1fullname, "/");
         obj1type = H5TRAV_TYPE_GROUP;
-        obj2fullname = (char*)HDcalloc(2, sizeof(char));
+        obj2fullname = (char*)HDcalloc((size_t)2, sizeof(char));
         HDstrcat(obj2fullname, "/");
         obj2type = H5TRAV_TYPE_GROUP;
     }
@@ -1554,9 +1554,9 @@ hsize_t diff(hid_t file1_id,
     hid_t   grp1_id = (-1);
     hid_t   grp2_id = (-1);
     int     ret;
-    int     is_dangle_link1 = 0;
-    int     is_dangle_link2 = 0;
-    int     is_hard_link = 0;
+    hbool_t     is_dangle_link1 = FALSE;
+    hbool_t     is_dangle_link2 = FALSE;
+    hbool_t     is_hard_link = FALSE;
     hsize_t nfound = 0;
     h5trav_type_t object_type;
 
@@ -1598,7 +1598,7 @@ hsize_t diff(hid_t file1_id,
                 goto out;
             }
             else
-                is_dangle_link1 = 1;
+                is_dangle_link1 = TRUE;
         }
         else if (ret < 0)
             goto out;
@@ -1616,7 +1616,7 @@ hsize_t diff(hid_t file1_id,
                 goto out;
             }
             else
-                is_dangle_link2 = 1;
+                is_dangle_link2 = TRUE;
         }
         else if (ret < 0)
             goto out;
diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h
index 9e1c8bb..04b640f 100644
--- a/tools/lib/h5diff.h
+++ b/tools/lib/h5diff.h
@@ -71,7 +71,7 @@ typedef struct {
     double   percent;               /* relative error value */
     int      n;                     /* count, compare up to count */
     hsize_t  count;                 /* count value */
-    int      follow_links;          /* follow symbolic links */
+    hbool_t  follow_links;          /* follow symbolic links */
     int      no_dangle_links;       /* return error when find dangling link */
     int      err_stat;              /* an error ocurred (1, error, 0, no error) */
     int      cmn_objs;              /* do we have common objects */
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index 7dba0e5..d08c23f 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -5792,14 +5792,14 @@ int ull2float(unsigned long long ull_value, float *f_value)
 
  src_size = H5Tget_size(H5T_NATIVE_ULLONG);
  dst_size = H5Tget_size(H5T_NATIVE_FLOAT);
- buf = (unsigned char*)HDcalloc(1, MAX(src_size, dst_size));
+ buf = (unsigned char*)HDcalloc((size_t)1, MAX(src_size, dst_size));
  if(!buf)
   goto error;
 
  HDmemcpy(buf, &ull_value, src_size);
 
  /* do conversion */
- if(H5Tconvert(H5T_NATIVE_ULLONG, H5T_NATIVE_FLOAT, 1, buf, NULL, dxpl_id)<0)
+ if(H5Tconvert(H5T_NATIVE_ULLONG, H5T_NATIVE_FLOAT, (size_t)1, buf, NULL, dxpl_id)<0)
   goto error;
 
  HDmemcpy(f_value, buf, dst_size);
@@ -6358,9 +6358,9 @@ static void get_member_types(hid_t tid, mcomp_t *members)
             return;
         members->n = (unsigned)nmembs;
 
-        members->ids = (hid_t *)HDcalloc(members->n, sizeof(hid_t));
-        members->offsets = (size_t *)HDcalloc(members->n, sizeof(size_t));
-        members->m = (mcomp_t **)HDcalloc(members->n, sizeof(mcomp_t *));
+        members->ids = (hid_t *)HDcalloc((size_t)members->n, sizeof(hid_t));
+        members->offsets = (size_t *)HDcalloc((size_t)members->n, sizeof(size_t));
+        members->m = (mcomp_t **)HDcalloc((size_t)members->n, sizeof(mcomp_t *));
 
         for(u = 0; u < members->n; u++)
         {
diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c
index ef1d761..44b623f 100644
--- a/tools/lib/h5diff_attr.c
+++ b/tools/lib/h5diff_attr.c
@@ -169,7 +169,7 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
         if((attr1_id = H5Aopen_by_idx(loc1_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)curr1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto error;
         /* get name */
-        if(H5Aget_name(attr1_id, ATTR_NAME_MAX, name1) < 0)
+        if(H5Aget_name(attr1_id, (size_t)ATTR_NAME_MAX, name1) < 0)
             goto error;
 
         /*------------------ 
@@ -177,7 +177,7 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
         if((attr2_id = H5Aopen_by_idx(loc2_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)curr2, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto error;
         /* get name */
-        if(H5Aget_name(attr2_id, ATTR_NAME_MAX, name2) < 0)
+        if(H5Aget_name(attr2_id, (size_t)ATTR_NAME_MAX, name2) < 0)
             goto error;
 
         /* criteria is string compare */
@@ -225,7 +225,7 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
         if((attr1_id = H5Aopen_by_idx(loc1_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)curr1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto error;
         /* get name */
-        if(H5Aget_name(attr1_id, ATTR_NAME_MAX, name1) < 0)
+        if(H5Aget_name(attr1_id, (size_t)ATTR_NAME_MAX, name1) < 0)
             goto error;
 
         table_attr_mark_exist(infile, name1, table_lp);
@@ -247,7 +247,7 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
         if((attr2_id = H5Aopen_by_idx(loc2_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)curr2, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto error;
         /* get name */
-        if(H5Aget_name(attr2_id, ATTR_NAME_MAX, name2) < 0)
+        if(H5Aget_name(attr2_id, (size_t)ATTR_NAME_MAX, name2) < 0)
             goto error;
 
         table_attr_mark_exist(infile, name2, table_lp);
@@ -447,8 +447,8 @@ hsize_t diff_attr(hid_t loc1_id,
         for(j = 0; j < rank1; j++)
             nelmts1 *= dims1[j];
 
-        buf1 = (void *)HDmalloc((unsigned)(nelmts1 * msize1));
-        buf2 = (void *)HDmalloc((unsigned)(nelmts1 * msize2));
+        buf1 = (void *)HDmalloc((size_t)(nelmts1 * msize1));
+        buf2 = (void *)HDmalloc((size_t)(nelmts1 * msize2));
         if(buf1 == NULL || buf2 == NULL) {
             parallel_print( "cannot read into memory\n" );
             goto error;
diff --git a/tools/lib/h5tools_filters.c b/tools/lib/h5tools_filters.c
index 341a5c9..2da21ef 100644
--- a/tools/lib/h5tools_filters.c
+++ b/tools/lib/h5tools_filters.c
@@ -62,7 +62,7 @@ int h5tools_canreadf(const char* name, /* object name, serves also as boolean pr
  /* check availability of filters */
  for(i = 0; i < nfilters; i++)
  {
-  if((filtn = H5Pget_filter2(dcpl_id, (unsigned)i, 0, 0, 0, 0, 0, NULL)) < 0)
+  if((filtn = H5Pget_filter2(dcpl_id, (unsigned)i, 0, 0, 0, (size_t)0, 0, NULL)) < 0)
    return -1;
 
   switch(filtn)
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 3320276..47bf60d 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -316,6 +316,7 @@ LIPO = @LIPO@
 LL_PATH = @LL_PATH@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_ADD_LIBHDF5_DEPENDENCY = @LT_ADD_LIBHDF5_DEPENDENCY@
 LT_STATIC_EXEC = @LT_STATIC_EXEC@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@