1 files changed, 5 insertions, 1 deletions
diff --git a/src/H5PL.c b/src/H5PL.c
index 1c4b355..21bc0f2 100644
--- a/src/H5PL.c
+++ b/src/H5PL.c
@@ -85,7 +85,7 @@ 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_PLUGIN
+#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.
      */