From bcd3ad56e849ff9be9e9a03a58c0d1910bf4da2a Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Thu, 30 Oct 2008 23:05:38 +0100
Subject: [PATCH] Enabled all available mail storage types (those compiled in
Dovecot) for the commandline tools and the testsuite.
---
src/sieve-bin/Makefile.am | 10 ++--------
src/sieve-bin/namespaces.c | 27 +--------------------------
src/testsuite/Makefile.am | 12 +++---------
src/testsuite/namespaces.c | 25 +------------------------
4 files changed, 7 insertions(+), 67 deletions(-)
diff --git a/src/sieve-bin/Makefile.am b/src/sieve-bin/Makefile.am
index 587c89d7a..dd6882f20 100644
--- a/src/sieve-bin/Makefile.am
+++ b/src/sieve-bin/Makefile.am
@@ -10,10 +10,6 @@ AM_CPPFLAGS = \
-I$(dovecot_incdir)/src/lib-mail \
-I$(dovecot_incdir)/src/lib-index \
-I$(dovecot_incdir)/src/lib-storage \
- -I$(dovecot_incdir)/src/lib-storage/index \
- -I$(dovecot_incdir)/src/lib-storage/index/raw \
- -I$(dovecot_incdir)/src/lib-storage/index/mbox \
- -I$(dovecot_incdir)/src/lib-storage/index/maildir \
-I$(dovecot_incdir)/src/deliver
sievec_LDFLAGS = -export-dynamic -Wl,--start-group
@@ -25,10 +21,8 @@ libs = \
$(top_srcdir)/src/lib-sieve/libsieve.la \
$(top_srcdir)/src/lib-util/libutil.la \
$(dovecot_incdir)/src/lib-storage/list/libstorage_list.a \
- $(dovecot_incdir)/src/lib-storage/index/raw/libstorage_raw.a \
- $(dovecot_incdir)/src/lib-storage/index/maildir/libstorage_maildir.a \
- $(dovecot_incdir)/src/lib-storage/index/mbox/libstorage_mbox.a \
- $(dovecot_incdir)/src/lib-storage/index/libstorage_index.a \
+ $(dovecot_incdir)/src/lib-storage/register/libstorage-register.a \
+ $(STORAGE_LIBS) \
$(dovecot_incdir)/src/lib-storage/libstorage.a \
$(dovecot_incdir)/src/lib-index/libindex.a \
$(dovecot_incdir)/src/lib-imap/libimap.a \
diff --git a/src/sieve-bin/namespaces.c b/src/sieve-bin/namespaces.c
index 660f50a99..996741282 100644
--- a/src/sieve-bin/namespaces.c
+++ b/src/sieve-bin/namespaces.c
@@ -9,10 +9,7 @@
#include "str-sanitize.h"
#include "strescape.h"
#include "message-address.h"
-#include "raw-storage.h"
-#include "mbox-storage.h"
-#include "maildir-storage.h"
-#include "mail-namespace.h"
+#include "mail-storage.h"
#include "namespaces.h"
@@ -24,28 +21,6 @@
#define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON"
-/* Initialization of available mail storage and mailbox list
- * formats.
- */
-
-extern struct mail_storage raw_storage;
-extern struct mail_storage maildir_storage;
-extern struct mail_storage mbox_storage;
-void mail_storage_register_all(void) {
- mail_storage_class_register(&raw_storage);
- mail_storage_class_register(&mbox_storage);
- mail_storage_class_register(&maildir_storage);
-}
-
-extern struct mailbox_list maildir_mailbox_list;
-extern struct mailbox_list fs_mailbox_list;
-void index_mailbox_list_init(void);
-void mailbox_list_register_all(void) {
- mailbox_list_register(&maildir_mailbox_list);
- mailbox_list_register(&fs_mailbox_list);
- index_mailbox_list_init();
-}
-
void namespaces_init(void)
{
mail_storage_init();
diff --git a/src/testsuite/Makefile.am b/src/testsuite/Makefile.am
index 1cb3a99ce..8634fdba6 100644
--- a/src/testsuite/Makefile.am
+++ b/src/testsuite/Makefile.am
@@ -7,11 +7,7 @@ AM_CPPFLAGS = \
-I$(dovecot_incdir)/src/lib \
-I$(dovecot_incdir)/src/lib-mail \
-I$(dovecot_incdir)/src/lib-index \
- -I$(dovecot_incdir)/src/lib-storage \
- -I$(dovecot_incdir)/src/lib-storage/index \
- -I$(dovecot_incdir)/src/lib-storage/index/raw \
- -I$(dovecot_incdir)/src/lib-storage/index/mbox \
- -I$(dovecot_incdir)/src/lib-storage/index/maildir
+ -I$(dovecot_incdir)/src/lib-storage
testsuite_LDFLAGS = -export-dynamic -Wl,--start-group
@@ -19,10 +15,8 @@ libs = \
$(top_srcdir)/src/lib-sieve/libsieve.la \
$(top_srcdir)/src/lib-util/libutil.la \
$(dovecot_incdir)/src/lib-storage/list/libstorage_list.a \
- $(dovecot_incdir)/src/lib-storage/index/raw/libstorage_raw.a \
- $(dovecot_incdir)/src/lib-storage/index/maildir/libstorage_maildir.a \
- $(dovecot_incdir)/src/lib-storage/index/mbox/libstorage_mbox.a \
- $(dovecot_incdir)/src/lib-storage/index/libstorage_index.a \
+ $(dovecot_incdir)/src/lib-storage/register/libstorage-register.a \
+ $(STORAGE_LIBS) \
$(dovecot_incdir)/src/lib-storage/libstorage.a \
$(dovecot_incdir)/src/lib-index/libindex.a \
$(dovecot_incdir)/src/lib-imap/libimap.a \
diff --git a/src/testsuite/namespaces.c b/src/testsuite/namespaces.c
index e1565c459..996741282 100644
--- a/src/testsuite/namespaces.c
+++ b/src/testsuite/namespaces.c
@@ -9,10 +9,7 @@
#include "str-sanitize.h"
#include "strescape.h"
#include "message-address.h"
-#include "raw-storage.h"
-#include "mbox-storage.h"
-#include "maildir-storage.h"
-#include "mail-namespace.h"
+#include "mail-storage.h"
#include "namespaces.h"
@@ -24,26 +21,6 @@
#define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON"
-/* Hideous .... */
-
-extern struct mail_storage raw_storage;
-extern struct mail_storage maildir_storage;
-extern struct mail_storage mbox_storage;
-void mail_storage_register_all(void) {
- mail_storage_class_register(&raw_storage);
- mail_storage_class_register(&mbox_storage);
- mail_storage_class_register(&maildir_storage);
-}
-
-extern struct mailbox_list maildir_mailbox_list;
-extern struct mailbox_list fs_mailbox_list;
-void index_mailbox_list_init(void);
-void mailbox_list_register_all(void) {
-mailbox_list_register(&maildir_mailbox_list);
-mailbox_list_register(&fs_mailbox_list);
-index_mailbox_list_init();
-}
-
void namespaces_init(void)
{
mail_storage_init();
--
GitLab