Remove -Iimap from CFLAGS and include imap/imap.h explicitely (#536)

diff --git a/Makefile.am b/Makefile.am
index 0a3117091fe16be3582a46323f9352cbe36e7f64..9c425d01155836c37728d170746bd11c4cfc3fe5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,6 @@ endif
 
 if BUILD_IMAP
 SUBDIRS += imap
-IMAP_INCLUDES = -I$(top_srcdir)/imap
 endif
 
 bin_SCRIPTS = $(SMIMEAUX_TARGET)
@@ -60,7 +59,7 @@ mutt_DEPENDENCIES = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAPDEPS) \
 DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\"
 
-AM_CPPFLAGS=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(GPGME_CFLAGS)
+AM_CPPFLAGS=-I. -I$(top_srcdir) $(GPGME_CFLAGS)
 
 EXTRA_mutt_SOURCES = account.c bcache.c bcache.h browser.h compress.c \
        crypt_gpgme.c crypt_mod_pgp_classic.c crypt_mod_pgp_gpgme.c \

diff --git a/browser.c b/browser.c
index b308bcdcfe3a054e87d27065a1b0a4db991ffdca..a9f485ed6cb0a56fc4ceb4fc7cd31145e22f0a89 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -35,7 +35,7 @@
 #include "mx.h"
 #include "sort.h"
 #ifdef USE_IMAP
-#include "imap.h"
+#include "imap/imap.h"
 #endif
 #ifdef USE_NNTP
 #include "nntp.h"

diff --git a/buffy.c b/buffy.c
index 771b50b3565292d43610de238e6740ea37c51100..6fc6c65a20aba7c70bc9784182be4ac44728735c 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -34,7 +34,7 @@
 #include "sidebar.h"
 #endif
 #ifdef USE_IMAP
-#include "imap.h"
+#include "imap/imap.h"
 #endif
 #ifdef USE_NOTMUCH
 #include "mutt_notmuch.h"

diff --git a/commands.c b/commands.c
index a6f5dc26255a5928e7e384ea60a9b57dbe071270..8a4e53623db87dbc5489d836f090bcb6e5efab18 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -42,7 +42,7 @@
 #include "pager.h"
 #include "sort.h"
 #ifdef USE_IMAP
-#include "imap.h"
+#include "imap/imap.h"
 #endif
 #ifdef USE_NOTMUCH
 #include "mutt_notmuch.h"

diff --git a/complete.c b/complete.c
index 2628ada979de3eb98806923f4f5effbfa1c4b888..16559196f7e5e23665cac7d2d8a2adacb5842f69 100644 (file)
--- a/complete.c
+++ b/complete.c
@@ -23,7 +23,7 @@
 #include <sys/types.h>
 #include "mutt.h"
 #ifdef USE_IMAP
-#include "imap.h"
+#include "imap/imap.h"
 #include "mailbox.h"
 #endif
 #ifdef USE_NNTP

diff --git a/curs_main.c b/curs_main.c
index 0b819631ae144d0f17b9dc4e3f61966cca488b8d..acf52b2b84f92a0a205684d7fec927233db83bc6 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -41,7 +41,7 @@
 #include "pop.h"
 #endif
 #ifdef USE_IMAP
-#include "imap_private.h"
+#include "imap/imap.h"
 #endif
 #ifdef USE_NOTMUCH
 #include "mutt_notmuch.h"

diff --git a/muttlib.c b/muttlib.c
index 50b641f6a66c02278b9741961b59e30738fa5415..bfc3e7eaf63b1b522ebadfcdb213110527f6bcc7 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -38,7 +38,7 @@
 #include "mx.h"
 #include "url.h"
 #ifdef USE_IMAP
-#include "imap.h"
+#include "imap/imap.h"
 #endif
 #ifdef USE_NOTMUCH
 #include "mutt_notmuch.h"

diff --git a/mx.c b/mx.c
index ef6cf256f643af60f6952446fe84f60251440c23..dadcad564697f0fe45cc55f50e91aefc9a3d98ef 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -44,7 +44,7 @@
 #include "compress.h"
 #endif
 #ifdef USE_IMAP
-#include "imap.h"
+#include "imap/imap.h"
 #endif
 #ifdef USE_POP
 #include "pop.h"

diff --git a/postpone.c b/postpone.c
index f059cf48e7f2d1d0ee63310950f0ce99f67f5b4c..8480e3851005faa49fd55167cc4f2c2365265b8f 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -29,7 +29,7 @@
 #include "mutt_menu.h"
 #include "sort.h"
 #ifdef USE_IMAP
-#include "imap.h"
+#include "imap/imap.h"
 #endif
 
 static const struct mapping_t PostponeHelp[] = {

diff --git a/system.c b/system.c
index ded2aeceb4ba3d3d59fa6111a56d06c6f6230ac3..117bc9c76269f7b919dadb9a440c30e4f7b39924 100644 (file)
--- a/system.c
+++ b/system.c
@@ -24,7 +24,7 @@
 #include "mutt.h"
 #ifdef USE_IMAP
 #include <errno.h>
-#include "imap.h"
+#include "imap/imap.h"
 #endif
 
 int _mutt_system(const char *cmd, int flags)