dovecot-2.0: plugins: Added dependencies.
dovecot at dovecot.org
dovecot at dovecot.org
Fri Oct 9 04:22:19 EEST 2009
details: http://hg.dovecot.org/dovecot-2.0/rev/399d769e593c
changeset: 10010:399d769e593c
user: Timo Sirainen <tss at iki.fi>
date: Thu Oct 08 21:22:12 2009 -0400
description:
plugins: Added dependencies.
The dependencies can only be checked if the dlopen() can successfully open
the module, so use (apparently) non-portable ltlibrary linking to force the
libraries we depend on to load with us.
diffstat:
18 files changed, 38 insertions(+)
src/plugins/fts-solr/Makefile.am | 1 +
src/plugins/fts-solr/fts-solr-plugin.c | 2 ++
src/plugins/fts-solr/fts-solr-plugin.h | 1 +
src/plugins/fts-squat/Makefile.am | 3 +++
src/plugins/fts-squat/fts-squat-plugin.c | 2 ++
src/plugins/fts-squat/fts-squat-plugin.h | 1 +
src/plugins/imap-acl/Makefile.am | 3 +++
src/plugins/imap-acl/imap-acl-plugin.c | 2 ++
src/plugins/imap-acl/imap-acl-plugin.h | 2 ++
src/plugins/imap-quota/Makefile.am | 3 +++
src/plugins/imap-quota/imap-quota-plugin.c | 2 ++
src/plugins/imap-quota/imap-quota-plugin.h | 2 ++
src/plugins/mail-log/Makefile.am | 3 +++
src/plugins/mail-log/mail-log-plugin.c | 2 ++
src/plugins/mail-log/mail-log-plugin.h | 2 ++
src/plugins/trash/Makefile.am | 3 +++
src/plugins/trash/trash-plugin.c | 2 ++
src/plugins/trash/trash-plugin.h | 2 ++
diffs (196 lines):
diff -r bdd87f9ccccf -r 399d769e593c src/plugins/fts-solr/Makefile.am
--- a/src/plugins/fts-solr/Makefile.am Thu Oct 08 21:19:29 2009 -0400
+++ b/src/plugins/fts-solr/Makefile.am Thu Oct 08 21:22:12 2009 -0400
@@ -12,6 +12,7 @@ module_LTLIBRARIES = \
lib21_fts_solr_plugin.la
lib21_fts_solr_plugin_la_LIBADD = \
+ ../fts/lib20_fts_plugin.la \
$(CURL_LIBS) -lexpat
lib21_fts_solr_plugin_la_SOURCES = \
diff -r bdd87f9ccccf -r 399d769e593c src/plugins/fts-solr/fts-solr-plugin.c
--- a/src/plugins/fts-solr/fts-solr-plugin.c Thu Oct 08 21:19:29 2009 -0400
+++ b/src/plugins/fts-solr/fts-solr-plugin.c Thu Oct 08 21:22:12 2009 -0400
@@ -83,3 +83,5 @@ void fts_solr_plugin_deinit(void)
fts_backend_unregister(fts_backend_solr.name);
hook_mail_user_created = fts_solr_next_hook_mail_user_created;
}
+
+const char *fts_solr_plugin_dependencies[] = { "fts", NULL };
diff -r bdd87f9ccccf -r 399d769e593c src/plugins/fts-solr/fts-solr-plugin.h
--- a/src/plugins/fts-solr/fts-solr-plugin.h Thu Oct 08 21:19:29 2009 -0400
+++ b/src/plugins/fts-solr/fts-solr-plugin.h Thu Oct 08 21:22:12 2009 -0400
@@ -18,6 +18,7 @@ struct fts_solr_user {
struct fts_solr_settings set;
};
+extern const char *fts_solr_plugin_dependencies[];
extern struct fts_backend fts_backend_solr;
extern MODULE_CONTEXT_DEFINE(fts_solr_user_module, &mail_user_module_register);
diff -r bdd87f9ccccf -r 399d769e593c src/plugins/fts-squat/Makefile.am
--- a/src/plugins/fts-squat/Makefile.am Thu Oct 08 21:19:29 2009 -0400
+++ b/src/plugins/fts-squat/Makefile.am Thu Oct 08 21:22:12 2009 -0400
@@ -9,6 +9,9 @@ lib21_fts_squat_plugin_la_LDFLAGS = -mod
module_LTLIBRARIES = \
lib21_fts_squat_plugin.la
+
+lib21_fts_squat_plugin_la_LIBADD = \
+ ../fts/lib20_fts_plugin.la
lib21_fts_squat_plugin_la_SOURCES = \
fts-squat-plugin.c \
diff -r bdd87f9ccccf -r 399d769e593c src/plugins/fts-squat/fts-squat-plugin.c
--- a/src/plugins/fts-squat/fts-squat-plugin.c Thu Oct 08 21:19:29 2009 -0400
+++ b/src/plugins/fts-squat/fts-squat-plugin.c Thu Oct 08 21:22:12 2009 -0400
@@ -14,3 +14,5 @@ void fts_squat_plugin_deinit(void)
{
fts_backend_unregister(fts_backend_squat.name);
}
+
+const char *fts_squat_plugin_dependencies[] = { "fts", NULL };
diff -r bdd87f9ccccf -r 399d769e593c src/plugins/fts-squat/fts-squat-plugin.h
--- a/src/plugins/fts-squat/fts-squat-plugin.h Thu Oct 08 21:19:29 2009 -0400
+++ b/src/plugins/fts-squat/fts-squat-plugin.h Thu Oct 08 21:22:12 2009 -0400
@@ -3,6 +3,7 @@
#include "fts-api-private.h"
+extern const char *fts_squat_plugin_dependencies[];
extern struct fts_backend fts_backend_squat;
void fts_squat_plugin_init(void);
diff -r bdd87f9ccccf -r 399d769e593c src/plugins/imap-acl/Makefile.am
--- a/src/plugins/imap-acl/Makefile.am Thu Oct 08 21:19:29 2009 -0400
+++ b/src/plugins/imap-acl/Makefile.am Thu Oct 08 21:22:12 2009 -0400
@@ -14,6 +14,9 @@ imap_module_LTLIBRARIES = \
imap_module_LTLIBRARIES = \
lib02_imap_acl_plugin.la
+lib02_imap_acl_plugin_la_LIBADD = \
+ ../acl/lib01_acl_plugin.la
+
lib02_imap_acl_plugin_la_SOURCES = \
imap-acl-plugin.c
diff -r bdd87f9ccccf -r 399d769e593c src/plugins/imap-acl/imap-acl-plugin.c
--- a/src/plugins/imap-acl/imap-acl-plugin.c Thu Oct 08 21:19:29 2009 -0400
+++ b/src/plugins/imap-acl/imap-acl-plugin.c Thu Oct 08 21:22:12 2009 -0400
@@ -643,3 +643,5 @@ void imap_acl_plugin_deinit(void)
hook_client_created = next_hook_client_created;
}
+
+const char *imap_acl_plugin_dependencies[] = { "acl", NULL };
diff -r bdd87f9ccccf -r 399d769e593c src/plugins/imap-acl/imap-acl-plugin.h
--- a/src/plugins/imap-acl/imap-acl-plugin.h Thu Oct 08 21:19:29 2009 -0400
+++ b/src/plugins/imap-acl/imap-acl-plugin.h Thu Oct 08 21:22:12 2009 -0400
@@ -1,5 +1,7 @@
#ifndef IMAP_ACL_PLUGIN_H
#define IMAP_ACL_PLUGIN_H
+
+extern const char *imap_acl_plugin_dependencies[];
void imap_acl_plugin_init(void);
void imap_acl_plugin_deinit(void);
diff -r bdd87f9ccccf -r 399d769e593c src/plugins/imap-quota/Makefile.am
--- a/src/plugins/imap-quota/Makefile.am Thu Oct 08 21:19:29 2009 -0400
+++ b/src/plugins/imap-quota/Makefile.am Thu Oct 08 21:22:12 2009 -0400
@@ -13,6 +13,9 @@ imap_module_LTLIBRARIES = \
imap_module_LTLIBRARIES = \
lib11_imap_quota_plugin.la
+lib11_imap_quota_plugin_la_LIBADD = \
+ ../quota/lib10_quota_plugin.la
+
lib11_imap_quota_plugin_la_SOURCES = \
imap-quota-plugin.c
diff -r bdd87f9ccccf -r 399d769e593c src/plugins/imap-quota/imap-quota-plugin.c
--- a/src/plugins/imap-quota/imap-quota-plugin.c Thu Oct 08 21:19:29 2009 -0400
+++ b/src/plugins/imap-quota/imap-quota-plugin.c Thu Oct 08 21:22:12 2009 -0400
@@ -223,3 +223,5 @@ void imap_quota_plugin_deinit(void)
hook_client_created = next_hook_client_created;
}
+
+const char *imap_quota_plugin_dependencies[] = { "quota", NULL };
diff -r bdd87f9ccccf -r 399d769e593c src/plugins/imap-quota/imap-quota-plugin.h
--- a/src/plugins/imap-quota/imap-quota-plugin.h Thu Oct 08 21:19:29 2009 -0400
+++ b/src/plugins/imap-quota/imap-quota-plugin.h Thu Oct 08 21:22:12 2009 -0400
@@ -1,5 +1,7 @@
#ifndef IMAP_QUOTA_PLUGIN_H
#define IMAP_QUOTA_PLUGIN_H
+
+extern const char *imap_quota_plugin_dependencies[];
void imap_quota_plugin_init(void);
void imap_quota_plugin_deinit(void);
diff -r bdd87f9ccccf -r 399d769e593c src/plugins/mail-log/Makefile.am
--- a/src/plugins/mail-log/Makefile.am Thu Oct 08 21:19:29 2009 -0400
+++ b/src/plugins/mail-log/Makefile.am Thu Oct 08 21:22:12 2009 -0400
@@ -13,6 +13,9 @@ module_LTLIBRARIES = \
module_LTLIBRARIES = \
lib20_mail_log_plugin.la
+lib20_mail_log_plugin_la_LIBADD = \
+ ../notify/lib15_notify_plugin.la
+
lib20_mail_log_plugin_la_SOURCES = \
mail-log-plugin.c
diff -r bdd87f9ccccf -r 399d769e593c src/plugins/mail-log/mail-log-plugin.c
--- a/src/plugins/mail-log/mail-log-plugin.c Thu Oct 08 21:19:29 2009 -0400
+++ b/src/plugins/mail-log/mail-log-plugin.c Thu Oct 08 21:22:12 2009 -0400
@@ -430,3 +430,5 @@ void mail_log_plugin_deinit(void)
{
notify_unregister(mail_log_ctx);
}
+
+const char *mail_log_plugin_dependencies[] = { "notify", NULL };
diff -r bdd87f9ccccf -r 399d769e593c src/plugins/mail-log/mail-log-plugin.h
--- a/src/plugins/mail-log/mail-log-plugin.h Thu Oct 08 21:19:29 2009 -0400
+++ b/src/plugins/mail-log/mail-log-plugin.h Thu Oct 08 21:22:12 2009 -0400
@@ -1,5 +1,7 @@
#ifndef MAIL_LOG_PLUGIN_H
#define MAIL_LOG_PLUGIN_H
+
+extern const char *mail_log_plugin_dependencies[];
void mail_log_plugin_init(void);
void mail_log_plugin_deinit(void);
diff -r bdd87f9ccccf -r 399d769e593c src/plugins/trash/Makefile.am
--- a/src/plugins/trash/Makefile.am Thu Oct 08 21:19:29 2009 -0400
+++ b/src/plugins/trash/Makefile.am Thu Oct 08 21:22:12 2009 -0400
@@ -10,6 +10,9 @@ module_LTLIBRARIES = \
module_LTLIBRARIES = \
lib11_trash_plugin.la
+lib11_trash_plugin_la_LIBADD = \
+ ../quota/lib10_quota_plugin.la
+
lib11_trash_plugin_la_SOURCES = \
trash-plugin.c
diff -r bdd87f9ccccf -r 399d769e593c src/plugins/trash/trash-plugin.c
--- a/src/plugins/trash/trash-plugin.c Thu Oct 08 21:19:29 2009 -0400
+++ b/src/plugins/trash/trash-plugin.c Thu Oct 08 21:22:12 2009 -0400
@@ -333,3 +333,5 @@ void trash_plugin_deinit(void)
{
hook_mail_namespaces_created = trash_hook_mail_namespaces_created;
}
+
+const char *trash_plugin_dependencies[] = { "quota", NULL };
diff -r bdd87f9ccccf -r 399d769e593c src/plugins/trash/trash-plugin.h
--- a/src/plugins/trash/trash-plugin.h Thu Oct 08 21:19:29 2009 -0400
+++ b/src/plugins/trash/trash-plugin.h Thu Oct 08 21:22:12 2009 -0400
@@ -1,5 +1,7 @@
#ifndef TRASH_PLUGIN_H
#define TRASH_PLUGIN_H
+
+extern const char *trash_plugin_dependencies[];
void trash_plugin_init(void);
void trash_plugin_deinit(void);
More information about the dovecot-cvs
mailing list