4 files changed, 17 insertions, 5 deletions
diff --git a/src/charon/Makefile.am b/src/charon/Makefile.am
index 0f17c9642..9d0e64879 100644
--- a/src/charon/Makefile.am
+++ b/src/charon/Makefile.am
@@ -129,44 +129,57 @@ endif
 ########################
 
 SUBDIRS = . 
+PLUGINS = ${libstrongswan_plugins}
 
 if USE_UNIT_TESTS
   SUBDIRS += plugins/unit_tester
+  PLUGINS += unit-tester
 endif
 
 if USE_STROKE
   SUBDIRS += plugins/stroke
+  PLUGINS += stroke
 endif
 
 if USE_SMP
   SUBDIRS += plugins/smp
+  PLUGINS += smb
 endif
 
 if USE_SQL
   SUBDIRS += plugins/sql
+  PLUGINS += sql
 endif
 
 if USE_EAP_IDENTITY
   SUBDIRS += plugins/eap_identity
+  PLUGINS += eap-identity
 endif
 
 if USE_EAP_SIM
   SUBDIRS += plugins/eap_sim
+  PLUGINS += eap-sim
 endif
 
 if USE_EAP_MD5
   SUBDIRS += plugins/eap_md5
+  PLUGINS += eap-md5
 endif
 
 if USE_EAP_AKA
   SUBDIRS += plugins/eap_aka
+  PLUGINS += eap-aka
 endif
 
 if USE_MEDSRV
   SUBDIRS += plugins/medsrv
+  PLUGINS += medsrv
 endif
 
 if USE_MEDCLI
   SUBDIRS += plugins/medcli
+  PLUGINS += medcli
 endif
 
+AM_CFLAGS += -DPLUGINS=\""${PLUGINS}\""
+
diff --git a/src/charon/daemon.c b/src/charon/daemon.c
index 2eb0d2eba..9406e89ea 100644
--- a/src/charon/daemon.c
+++ b/src/charon/daemon.c
@@ -382,8 +382,7 @@ static bool initialize(private_daemon_t *this, bool syslog, level_t levels[])
 	
 	/* load plugins, further infrastructure may need it */
 	lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, 
-		lib->settings->get_str(lib->settings, "charon.load", 
-		   "aes des gmp hmac md5 random sha1 sha2 pubkey x509 xcbc stroke"));
+		lib->settings->get_str(lib->settings, "charon.load", PLUGINS));
 	
 	this->public.ike_sa_manager = ike_sa_manager_create();
 	if (this->public.ike_sa_manager == NULL)
diff --git a/src/charon/plugins/sql/Makefile.am b/src/charon/plugins/sql/Makefile.am
index 7dc42c181..d412980ef 100644
--- a/src/charon/plugins/sql/Makefile.am
+++ b/src/charon/plugins/sql/Makefile.am
@@ -1,7 +1,8 @@
 
 INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon
 
-AM_CFLAGS = -rdynamic -DIPSEC_PLUGINDIR=\"${plugindir}\"
+AM_CFLAGS = -rdynamic \
+  -DIPSEC_PLUGINDIR=\"${plugindir}\" -DPLUGINS=\""${libstrongswan_plugins}\""
 
 plugin_LTLIBRARIES = libstrongswan-sql.la
 libstrongswan_sql_la_SOURCES = sql_plugin.h sql_plugin.c \
diff --git a/src/charon/plugins/sql/pool.c b/src/charon/plugins/sql/pool.c
index 40ff6bc55..43a4f33ab 100644
--- a/src/charon/plugins/sql/pool.c
+++ b/src/charon/plugins/sql/pool.c
@@ -359,8 +359,7 @@ int main(int argc, char *argv[])
 	library_init(STRONGSWAN_CONF);
 	atexit(library_deinit);
 	lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR,
-		lib->settings->get_str(lib->settings, "pool.load",
-			"sqlite mysql"));
+		lib->settings->get_str(lib->settings, "pool.load", PLUGINS));
 	
 	uri = lib->settings->get_str(lib->settings, "charon.plugins.sql.database", NULL);
 	if (!uri)