Also check for the plugin suffix

diff --git a/src/Makefile.am b/src/Makefile.am
index f430368fb84bf71418bccb6cd7c6d4cc461031f0..83eb87f9bd62b8286c7205a840ddd167ea2cc8f9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,7 @@ statedir = $(localstatedir)/run/connman
 storagedir = $(localstatedir)/lib/connman
 
 if MAINTAINER_MODE
-plugindir = $(abs_top_srcdir)/plugins
+plugindir = $(abs_top_srcdir)/plugins/.libs
 else
 plugindir = $(libdir)/connman/plugins
 endif

diff --git a/src/plugin.c b/src/plugin.c
index 8e164e1e02b184172c4ff3036a0da56dfcb4192a..801df8b4b0fe3dc83fc75a2c9425b587c15cd9c7 100644 (file)
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -69,7 +69,8 @@ static void load_plugins(const gchar *path)
                        GModule *module;
                        struct connman_plugin_desc *desc;
 
-                       if (g_str_has_prefix(file, "libconnman") == FALSE)
+                       if (g_str_has_prefix(file, "libconnman") == FALSE ||
+                                       g_str_has_suffix(file, ".so") == FALSE)
                                continue;
 
                        filename = g_build_filename(path, file, NULL);