Mercurial > dovecot > core-2.2
changeset 15380:7c75559cd8f6
Reverted 269104a0821b (Build imapc and pop3c always as plugins.)
This is no longer needed now that lib-ssl-iostream can be linked without
linking openssl.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Tue, 06 Nov 2012 01:11:03 +0200 |
parents | 68d21f872fd7 |
children | 1ab783418ff6 |
files | configure.ac src/lib-storage/index/imapc/Makefile.am src/lib-storage/index/imapc/imapc-list.c src/lib-storage/index/imapc/imapc-list.h src/lib-storage/index/imapc/imapc-plugin.c src/lib-storage/index/imapc/imapc-plugin.h src/lib-storage/index/imapc/imapc-setting-storage.c src/lib-storage/index/imapc/imapc-settings.h src/lib-storage/index/imapc/imapc-storage.c src/lib-storage/index/imapc/imapc-storage.h src/lib-storage/index/pop3c/Makefile.am src/lib-storage/index/pop3c/pop3c-plugin.c src/lib-storage/index/pop3c/pop3c-plugin.h src/lib-storage/index/pop3c/pop3c-setting-storage.c src/lib-storage/index/pop3c/pop3c-settings.h src/lib-storage/index/pop3c/pop3c-storage.c src/lib-storage/index/pop3c/pop3c-storage.h |
diffstat | 17 files changed, 29 insertions(+), 146 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Tue Nov 06 01:04:24 2012 +0200 +++ b/configure.ac Tue Nov 06 01:11:03 2012 +0200 @@ -247,14 +247,14 @@ want_gc=no) AC_ARG_WITH(storages, -AS_HELP_STRING([--with-storages], [Build with specified mail storage formats (mdbox sdbox maildir mbox cydir)]), [ +AS_HELP_STRING([--with-storages], [Build with specified mail storage formats (mdbox sdbox maildir mbox cydir imapc pop3c)]), [ if test "$withval" = "yes" || test "$withval" = "no"; then AC_MSG_ERROR([--with-storages needs storage list as parameter]) fi mail_storages="shared `echo "$withval"|sed 's/,/ /g'`" ], - mail_storages="shared mdbox sdbox maildir mbox cydir") + mail_storages="shared mdbox sdbox maildir mbox cydir imapc pop3c") AC_SUBST(mail_storages) -mail_storages="$mail_storages imapc_stub pop3c_stub raw fail" +mail_storages="$mail_storages raw fail" # drop duplicates duplicates=`(for i in $mail_storages; do echo $i; done)|sort|uniq -d|xargs echo` if test "$duplicates" != ""; then @@ -2459,8 +2459,8 @@ sdbox_libs='$(top_builddir)/src/lib-storage/index/dbox-single/libstorage_dbox_single.la' mdbox_libs='$(top_builddir)/src/lib-storage/index/dbox-multi/libstorage_dbox_multi.la' cydir_libs='$(top_builddir)/src/lib-storage/index/cydir/libstorage_cydir.la' -imapc_stub_libs='$(top_builddir)/src/lib-storage/index/imapc/libstorage_imapc.la' -pop3c_stub_libs='$(top_builddir)/src/lib-storage/index/pop3c/libstorage_pop3c.la' +imapc_libs='$(top_builddir)/src/lib-storage/index/imapc/libstorage_imapc.la $(top_builddir)/src/lib-imap-client/libimap_client.la' +pop3c_libs='$(top_builddir)/src/lib-storage/index/pop3c/libstorage_pop3c.la' raw_libs='$(top_builddir)/src/lib-storage/index/raw/libstorage_raw.la' shared_libs='$(top_builddir)/src/lib-storage/index/shared/libstorage_shared.la' @@ -2480,8 +2480,21 @@ LINKED_STORAGE_LIBS="$LINKED_STORAGE_LIBS $dbox_common_libs" dbox_common_libs="" fi + if test $storage = imapc; then + mailbox_list_drivers="$mailbox_list_drivers imapc" + want_ssl_libs=yes + fi + if test $storage = pop3c; then + want_ssl_libs=yes + fi done +LINKED_STORAGE_LDADD= +if test "$want_ssl_libs" = yes; then + LINKED_STORAGE_LIBS="$LINKED_STORAGE_LIBS \$(top_builddir)/src/lib-ssl-iostream/libssl_iostream.la" + LINKED_STORAGE_LDADD="$SSL_LIBS" +fi AC_SUBST(LINKED_STORAGE_LIBS) +AC_SUBST(LINKED_STORAGE_LDADD) AC_SUBST(mailbox_list_drivers) AC_DEFINE_UNQUOTED(MAIL_STORAGES, "$mail_storages", List of compiled in mail storages) @@ -2511,7 +2524,7 @@ LIBDOVECOT_COMPRESS='$(top_builddir)/src/lib-compression/libcompression.la' LIBDOVECOT_LDA='$(top_builddir)/src/lib-lda/liblda.la' fi -LIBDOVECOT_STORAGE="$LIBDOVECOT_STORAGE_DEPS" +LIBDOVECOT_STORAGE="$LIBDOVECOT_STORAGE_DEPS $LINKED_STORAGE_LDADD" LIBDOVECOT_SQL='$(top_builddir)/src/lib-sql/libsql.la' AC_SUBST(LIBDOVECOT) AC_SUBST(LIBDOVECOT_DEPS)
--- a/src/lib-storage/index/imapc/Makefile.am Tue Nov 06 01:04:24 2012 +0200 +++ b/src/lib-storage/index/imapc/Makefile.am Tue Nov 06 01:11:03 2012 +0200 @@ -1,5 +1,4 @@ noinst_LTLIBRARIES = libstorage_imapc.la -module_LTLIBRARIES = lib20_imapc_plugin.la AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ @@ -13,27 +12,16 @@ -I$(top_srcdir)/src/lib-storage/list \ -I$(top_srcdir)/src/lib-storage/index -NOPLUGIN_LDFLAGS = -lib20_imapc_plugin_la_LDFLAGS = -module -avoid-version - libstorage_imapc_la_SOURCES = \ - imapc-settings.c \ - imapc-setting-storage.c - -lib20_imapc_plugin_la_SOURCES = \ imapc-list.c \ imapc-mail.c \ imapc-mail-fetch.c \ imapc-mailbox.c \ - imapc-plugin.c \ imapc-save.c \ + imapc-settings.c \ imapc-sync.c \ imapc-storage.c -lib20_imapc_plugin_la_LIBADD = \ - ../../../lib-imap-client/libimap_client.la \ - ../../../lib-ssl-iostream/libssl_iostream.la - headers = \ imapc-list.h \ imapc-mail.h \ @@ -43,6 +31,3 @@ pkginc_libdir=$(pkgincludedir) pkginc_lib_HEADERS = $(headers) - -noinst_HEADERS = \ - imapc-plugin.h
--- a/src/lib-storage/index/imapc/imapc-list.c Tue Nov 06 01:04:24 2012 +0200 +++ b/src/lib-storage/index/imapc/imapc-list.c Tue Nov 06 01:11:03 2012 +0200 @@ -20,6 +20,8 @@ struct mailbox_info info; }; +extern struct mailbox_list imapc_mailbox_list; + static struct mailbox_list *imapc_list_alloc(void) { struct imapc_mailbox_list *list;
--- a/src/lib-storage/index/imapc/imapc-list.h Tue Nov 06 01:04:24 2012 +0200 +++ b/src/lib-storage/index/imapc/imapc-list.h Tue Nov 06 01:11:03 2012 +0200 @@ -22,8 +22,6 @@ unsigned int index_list_failed:1; }; -extern struct mailbox_list imapc_mailbox_list; - int imapc_list_get_mailbox_flags(struct mailbox_list *list, const char *name, enum mailbox_info_flags *flags_r);
--- a/src/lib-storage/index/imapc/imapc-plugin.c Tue Nov 06 01:04:24 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -/* Copyright (c) 2012 Dovecot authors, see the included COPYING file */ - -#include "lib.h" -#include "imapc-list.h" -#include "imapc-storage.h" -#include "imapc-plugin.h" - -const char *imapc_plugin_version = DOVECOT_ABI_VERSION; - -void imapc_plugin_init(struct module *module ATTR_UNUSED) -{ - mail_storage_class_unregister(&imapc_stub_storage); - mail_storage_class_register(&imapc_storage); - mailbox_list_register(&imapc_mailbox_list); -} - -void imapc_plugin_deinit(void) -{ - mail_storage_class_unregister(&imapc_storage); - mailbox_list_unregister(&imapc_mailbox_list); -}
--- a/src/lib-storage/index/imapc/imapc-plugin.h Tue Nov 06 01:04:24 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -#ifndef IMAPC_PLUGIN_H -#define IMAPC_PLUGIN_H - -void imapc_plugin_init(struct module *module); -void imapc_plugin_deinit(void); - -#endif
--- a/src/lib-storage/index/imapc/imapc-setting-storage.c Tue Nov 06 01:04:24 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -/* Copyright (c) 2012 Dovecot authors, see the included COPYING file */ - -#include "lib.h" -#include "imapc-storage.h" -#include "imapc-settings.h" - -struct mail_storage imapc_stub_storage = { - .name = IMAPC_STORAGE_NAME, - .class_flags = MAIL_STORAGE_CLASS_FLAG_NO_ROOT, - - .v = { - imapc_get_setting_parser_info, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL - } -};
--- a/src/lib-storage/index/imapc/imapc-settings.h Tue Nov 06 01:04:24 2012 +0200 +++ b/src/lib-storage/index/imapc/imapc-settings.h Tue Nov 06 01:11:03 2012 +0200 @@ -30,8 +30,6 @@ enum imapc_features parsed_features; }; -extern struct mail_storage imapc_stub_storage; - const struct setting_parser_info *imapc_get_setting_parser_info(void); #endif
--- a/src/lib-storage/index/imapc/imapc-storage.c Tue Nov 06 01:04:24 2012 +0200 +++ b/src/lib-storage/index/imapc/imapc-storage.c Tue Nov 06 01:11:03 2012 +0200 @@ -27,6 +27,9 @@ enum mail_error error; }; +extern struct mail_storage imapc_storage; +extern struct mailbox imapc_mailbox; + static struct imapc_resp_code_map imapc_resp_code_map[] = { { IMAP_RESP_CODE_UNAVAILABLE, MAIL_ERROR_TEMP }, { IMAP_RESP_CODE_AUTHFAILED, MAIL_ERROR_PERM },
--- a/src/lib-storage/index/imapc/imapc-storage.h Tue Nov 06 01:04:24 2012 +0200 +++ b/src/lib-storage/index/imapc/imapc-storage.h Tue Nov 06 01:11:03 2012 +0200 @@ -110,9 +110,6 @@ int ret; }; -extern struct mail_storage imapc_storage; -extern struct mailbox imapc_mailbox; - struct mail_save_context * imapc_save_alloc(struct mailbox_transaction_context *_t); int imapc_save_begin(struct mail_save_context *ctx, struct istream *input);
--- a/src/lib-storage/index/pop3c/Makefile.am Tue Nov 06 01:04:24 2012 +0200 +++ b/src/lib-storage/index/pop3c/Makefile.am Tue Nov 06 01:11:03 2012 +0200 @@ -1,5 +1,4 @@ noinst_LTLIBRARIES = libstorage_pop3c.la -module_LTLIBRARIES = lib20_pop3c_plugin.la AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ @@ -12,23 +11,13 @@ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-storage/index -NOPLUGIN_LDFLAGS = -lib20_pop3c_plugin_la_LDFLAGS = -module -avoid-version - libstorage_pop3c_la_SOURCES = \ - pop3c-settings.c \ - pop3c-setting-storage.c - -lib20_pop3c_plugin_la_SOURCES = \ pop3c-client.c \ pop3c-mail.c \ - pop3c-plugin.c \ + pop3c-settings.c \ pop3c-storage.c \ pop3c-sync.c -lib20_pop3c_plugin_la_LIBADD = \ - ../../../lib-ssl-iostream/libssl_iostream.la - headers = \ pop3c-client.h \ pop3c-settings.h \ @@ -37,6 +26,3 @@ pkginc_libdir=$(pkgincludedir) pkginc_lib_HEADERS = $(headers) - -noinst_HEADERS = \ - pop3c-plugin.h
--- a/src/lib-storage/index/pop3c/pop3c-plugin.c Tue Nov 06 01:04:24 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -/* Copyright (c) 2012 Dovecot authors, see the included COPYING file */ - -#include "lib.h" -#include "pop3c-storage.h" -#include "pop3c-settings.h" -#include "pop3c-plugin.h" - -const char *pop3c_plugin_version = DOVECOT_ABI_VERSION; - -void pop3c_plugin_init(struct module *module ATTR_UNUSED) -{ - mail_storage_class_unregister(&pop3c_stub_storage); - mail_storage_class_register(&pop3c_storage); -} - -void pop3c_plugin_deinit(void) -{ - mail_storage_class_unregister(&pop3c_storage); -}
--- a/src/lib-storage/index/pop3c/pop3c-plugin.h Tue Nov 06 01:04:24 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -#ifndef POP3C_PLUGIN_H -#define POP3C_PLUGIN_H - -void pop3c_plugin_init(struct module *module); -void pop3c_plugin_deinit(void); - -#endif
--- a/src/lib-storage/index/pop3c/pop3c-setting-storage.c Tue Nov 06 01:04:24 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -/* Copyright (c) 2012 Dovecot authors, see the included COPYING file */ - -#include "lib.h" -#include "pop3c-storage.h" -#include "pop3c-settings.h" - -struct mail_storage pop3c_stub_storage = { - .name = POP3C_STORAGE_NAME, - .class_flags = MAIL_STORAGE_CLASS_FLAG_NO_ROOT, - - .v = { - pop3c_get_setting_parser_info, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL - } -};
--- a/src/lib-storage/index/pop3c/pop3c-settings.h Tue Nov 06 01:04:24 2012 +0200 +++ b/src/lib-storage/index/pop3c/pop3c-settings.h Tue Nov 06 01:11:03 2012 +0200 @@ -17,8 +17,6 @@ const char *ssl_crypto_device; }; -extern struct mail_storage pop3c_stub_storage; - const struct setting_parser_info *pop3c_get_setting_parser_info(void); #endif
--- a/src/lib-storage/index/pop3c/pop3c-storage.c Tue Nov 06 01:04:24 2012 +0200 +++ b/src/lib-storage/index/pop3c/pop3c-storage.c Tue Nov 06 01:11:03 2012 +0200 @@ -14,6 +14,9 @@ #define DNS_CLIENT_SOCKET_NAME "dns-client" +extern struct mail_storage pop3c_storage; +extern struct mailbox pop3c_mailbox; + static struct mail_storage *pop3c_storage_alloc(void) { struct pop3c_storage *storage;
--- a/src/lib-storage/index/pop3c/pop3c-storage.h Tue Nov 06 01:04:24 2012 +0200 +++ b/src/lib-storage/index/pop3c/pop3c-storage.h Tue Nov 06 01:11:03 2012 +0200 @@ -29,8 +29,6 @@ unsigned int logged_in:1; }; -extern struct mail_storage pop3c_storage; -extern struct mailbox pop3c_mailbox; extern struct mail_vfuncs pop3c_mail_vfuncs; #endif