[svn-r24205] Merge HDFFV-8513/8522 from trunk (via cmake branch), h5repack UD plugins.

Also warning session fixes.

Tested: CMake local linux

3 files changed, 10 insertions, 8 deletions

diff --git a/src/H5PL.c b/src/H5PL.c
index 59bb5e5..2de59eb 100644
--- a/src/H5PL.c
+++ b/src/H5PL.c
@@ -43,7 +43,6 @@
 /* Windows support */
 #ifdef H5_HAVE_WIN32_API
 
-#define H5PL_DEFAULT_PATH       "%ALLUSERSPROFILE%/hdf5/lib/plugin"
 #define H5PL_PATH_SEPARATOR     ";"
 
 /* Handle for dynamic library */
@@ -66,7 +65,6 @@ typedef const void *(__cdecl *H5PL_get_plugin_info_t)(void);
 /* Unix support */
 #else /* H5_HAVE_WIN32_API */
 
-#define H5PL_DEFAULT_PATH       "/usr/local/hdf5/lib/plugin"
 #define H5PL_PATH_SEPARATOR     ":"
 
 /* Handle for dynamic library */
@@ -87,6 +85,8 @@ typedef const void *(__cdecl *H5PL_get_plugin_info_t)(void);
 typedef const void *(*H5PL_get_plugin_info_t)(void);
 #endif /* H5_HAVE_WIN32_API */
 
+#define H5PL_DEFAULT_PATH       H5_DEFAULT_PLUGINDIR
+
 /* Special symbol to indicate no plugin loading */
 #define H5PL_NO_PLUGIN          "::"
 
@@ -273,6 +273,10 @@ H5PL_load(H5PL_type_t type, int id)
 
     FUNC_ENTER_NOAPI(NULL)
 
+    /* Check for "no plugins" indicated" */
+    if(H5PL_no_plugin_g)
+        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTLOAD, NULL, "required dynamically loaded plugin filter '%d' is not available", id)
+
     /* Initialize the location paths for dynamic libraries, if they aren't
      * already set up.
      */
@@ -456,7 +460,7 @@ H5PL__find(H5PL_type_t plugin_type, int type_id, char *dir, const void **info)
     FUNC_ENTER_STATIC
 
     /* Specify a file mask. *.* = We want everything! */
-    sprintf(service, "%s\/*.dll", dir);
+    sprintf(service, "%s\\*.dll", dir);
     if((hFind = FindFirstFile(service, &fdFile)) == INVALID_HANDLE_VALUE)
         HGOTO_ERROR(H5E_PLUGIN, H5E_OPENERROR, FAIL, "can't open directory")
 
diff --git a/src/H5Z.c b/src/H5Z.c
index 2c5061f..486d2c4 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -1327,10 +1327,6 @@ H5Z_pipeline(const H5O_pline_t *pline, unsigned flags,
                 hbool_t issue_error = FALSE;
 #ifndef H5_VMS
 
-                /* Check for "no plugins" indicated" */
-	        if(H5PL_no_plugin())
-                    issue_error = TRUE;
-                else {
                     const H5Z_class2_t    *filter_info;
 
                     /* Try loading the filter */
@@ -1345,7 +1341,6 @@ H5Z_pipeline(const H5O_pline_t *pline, unsigned flags,
                     } /* end if */
                     else
                         issue_error = TRUE;
-                } /* end else */
 #else /*H5_VMS*/
                 issue_error = TRUE;
 #endif /*H5_VMS*/
diff --git a/src/H5config.h.in b/src/H5config.h.in
index ed1424c..6e3b932 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -21,6 +21,9 @@
    problem converting from unsigned long long to long double */
 #undef CYGWIN_ULLONG_TO_LDOUBLE_ROUND_PROBLEM
 
+/* Define the default plugins path to compile */
+#undef DEFAULT_PLUGINDIR
+
 /* Define the default virtual file driver to compile */
 #undef DEFAULT_VFD