Also check for the plugin suffix
authorMarcel Holtmann <marcel@holtmann.org>
Fri, 28 Mar 2008 20:37:55 +0000 (21:37 +0100)
committerMarcel Holtmann <marcel@holtmann.org>
Fri, 28 Mar 2008 20:37:55 +0000 (21:37 +0100)
src/Makefile.am
src/plugin.c

index f430368..83eb87f 100644 (file)
@@ -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
index 8e164e1..801df8b 100644 (file)
@@ -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);