lib-storage: Include mail-index.h from mail-storage.h

This makes it a bit more acceptable to use mail-index.h API, without having
to go through the lib-storage layer. This is also needed by the next patch
to avoid duplicating the same enum in both lib-index and lib-storage layer.

diff --git a/src/imap-urlauth/Makefile.am b/src/imap-urlauth/Makefile.am
index 2eaea752dcad784e060bd4c939f84e7a81a3138f..c9a37e683b5337b4b4a6c460eb064217fe476618 100644 (file)
--- a/src/imap-urlauth/Makefile.am
+++ b/src/imap-urlauth/Makefile.am
@@ -59,6 +59,7 @@ imap_urlauth_worker_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-imap-storage \
        -I$(top_srcdir)/src/lib-imap-urlauth \
        -I$(top_srcdir)/src/lib-mail \
+       -I$(top_srcdir)/src/lib-index \
        -I$(top_srcdir)/src/lib-storage \
        -I$(top_srcdir)/src/login-common
 

diff --git a/src/lib-imap-urlauth/Makefile.am b/src/lib-imap-urlauth/Makefile.am
index aae65347a2dc951ec5aacce91c0856da29b3ae02..6734b7251eec02ea5d76c9a8689348bcd6fdc268 100644 (file)
--- a/src/lib-imap-urlauth/Makefile.am
+++ b/src/lib-imap-urlauth/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-charset \
        -I$(top_srcdir)/src/lib-dict \
        -I$(top_srcdir)/src/lib-mail \
+       -I$(top_srcdir)/src/lib-index \
        -I$(top_srcdir)/src/lib-storage \
        -I$(top_srcdir)/src/lib-imap \
        -I$(top_srcdir)/src/lib-imap-storage

diff --git a/src/lib-storage/mail-storage.h b/src/lib-storage/mail-storage.h
index 46d4a6ecac96a96bd9ff0266c28a94d8a62784c0..e9d78ad0e823ba49717ff2274481b5da8c18f13c 100644 (file)
--- a/src/lib-storage/mail-storage.h
+++ b/src/lib-storage/mail-storage.h
@@ -8,6 +8,7 @@ struct message_size;
 #include "guid.h"
 #include "mail-types.h"
 #include "mail-error.h"
+#include "mail-index.h"
 #include "mail-namespace.h"
 #include "mailbox-list.h"
 #include "mailbox-attribute.h"

diff --git a/src/plugins/imap-quota/Makefile.am b/src/plugins/imap-quota/Makefile.am
index c2ccf0fbf5d68ad933d93d5c5a2709d9cf1c1b86..7c19c024847cb83dcd805b2750627641ea83ac84 100644 (file)
--- a/src/plugins/imap-quota/Makefile.am
+++ b/src/plugins/imap-quota/Makefile.am
@@ -2,6 +2,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-mail \
        -I$(top_srcdir)/src/lib-imap \
+       -I$(top_srcdir)/src/lib-index \
        -I$(top_srcdir)/src/lib-storage \
        -I$(top_srcdir)/src/imap \
        -I$(top_srcdir)/src/plugins/quota

diff --git a/src/pop3/Makefile.am b/src/pop3/Makefile.am
index 44ae4b7afa7395a52045f7ad7a2c110ea4a9b994..fe49741821c9660fe798bb12d637dd9f7d6241d3 100644 (file)
--- a/src/pop3/Makefile.am
+++ b/src/pop3/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-master \
        -I$(top_srcdir)/src/lib-dict \
        -I$(top_srcdir)/src/lib-mail \
+       -I$(top_srcdir)/src/lib-index \
        -I$(top_srcdir)/src/lib-storage \
        $(BINARY_CFLAGS)