remove -Inntp

Signed-off-by: Pierre Habouzit <madcoder@madism.org>

diff --git a/Makefile.am b/Makefile.am
index 2877658..8bc2864 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,6 @@ EXTRA_PROGRAMS = madmutt_dotlock pgpringng pgpewrapng makedoc
 
 if BUILD_NNTP
 NNTP_SUBDIR = nntp
-NNTP_INCLUDES = -I$(top_srcdir)/nntp
 endif
 
 SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) contrib \
@@ -52,7 +51,7 @@ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
        -DHAVE_CONFIG_H=1 -DPKGDOCDIR=\"$(docdir)\"
 
-INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(NNTP_INCLUDES) $(GPGME_CFLAGS) -Iintl
+INCLUDES=-I$(top_srcdir) $(GPGME_CFLAGS) -Iintl
 
 CPPFLAGS=@CPPFLAGS@ -I$(includedir)
 

diff --git a/browser.c b/browser.c
index c6207c7..a9437dd 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -27,7 +27,7 @@
 
 #include <imap/imap.h>
 #ifdef USE_NNTP
-#include "nntp.h"
+#include <nntp/nntp.h>
 #endif
 
 static struct mapping_t FolderHelp[] = {

diff --git a/compose.c b/compose.c
index 96d0bb1..c1a0de4 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -36,7 +36,7 @@
 #endif
 
 #ifdef USE_NNTP
-#include "nntp.h"
+#include <nntp/nntp.h>
 #endif
 
 static const char *There_are_no_attachments = N_("There are no attachments.");

diff --git a/send.c b/send.c
index 62748d4..736e0c0 100644 (file)
--- a/send.c
+++ b/send.c
@@ -25,7 +25,7 @@
 #include "attach.h"
 
 #ifdef USE_NNTP
-#include "nntp.h"
+#include <nntp/nntp.h>
 #endif
 
 #ifdef MIXMASTER

diff --git a/sendlib.c b/sendlib.c
index 0324295..c406c38 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -33,7 +33,7 @@
 #endif /* USE_LIBESMTP */
 
 #ifdef USE_NNTP
-#include <nntp.h>
+#include <nntp/nntp.h>
 #endif
 
 #ifdef HAVE_SYSEXITS_H