From: Damien Riegel <damien.riegel@gmail.com>
Date: Mon, 24 Apr 2017 21:16:59 +0000 (-0400)
Subject: remove some obsolete HAVE_ tests
X-Git-Tag: neomutt-20170526~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81cf91a32f56cfb02f57ea3b6de42ae784490cc1;p=neomutt

remove some obsolete HAVE_ tests

Delete tests against some defines because there is nothing in configure
to generate those defines:

     HAVE_ALLOCA_H
     HAVE_GNUTLS_OPENSSL_H
     HAVE_PGP
     HAVE_REGCOMP
     HAVE_SMIME

They are like `#if 0`, only harder to spot!
---

diff --git a/hdrline.c b/hdrline.c
index fae24f8e1..5b47e5348 100644
--- a/hdrline.c
+++ b/hdrline.c
@@ -28,9 +28,6 @@
 #include "mutt_curses.h"
 #include "mutt_idna.h"
 #include "sort.h"
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
 #ifdef USE_NOTMUCH
 #include "mutt_notmuch.h"
 #endif
diff --git a/imap/message.c b/imap/message.c
index c413f0b25..dff389f7b 100644
--- a/imap/message.c
+++ b/imap/message.c
@@ -26,9 +26,6 @@
 #include "mutt.h"
 #include "bcache.h"
 #include "mx.h"
-#ifdef HAVE_PGP
-#include "pgp.h"
-#endif
 #ifdef USE_HCACHE
 #include "hcache.h"
 #endif
@@ -877,11 +874,6 @@ parsemsg:
 
   h->content->length = ftell(msg->fp) - h->content->offset;
 
-/* This needs to be done in case this is a multipart message */
-#if defined(HAVE_PGP) || defined(HAVE_SMIME)
-  h->security = crypt_query(h->content);
-#endif
-
   mutt_clear_error();
   rewind(msg->fp);
   HEADER_DATA(h)->parsed = true;
diff --git a/mutt_ssl_gnutls.c b/mutt_ssl_gnutls.c
index 6674c81b7..f020f9c7d 100644
--- a/mutt_ssl_gnutls.c
+++ b/mutt_ssl_gnutls.c
@@ -25,9 +25,6 @@
 #include "mutt_regex.h"
 #include "mutt_socket.h"
 #include "mutt_ssl.h"
-#ifdef HAVE_GNUTLS_OPENSSL_H
-#include <gnutls/openssl.h>
-#endif
 
 /* certificate error bitmap values */
 #define CERTERR_VALID 0
diff --git a/nntp.c b/nntp.c
index ef3926d1e..e2884f001 100644
--- a/nntp.c
+++ b/nntp.c
@@ -35,12 +35,6 @@
 #ifdef USE_SSL
 #include "mutt_ssl.h"
 #endif
-#ifdef HAVE_PGP
-#include "pgp.h"
-#endif
-#ifdef HAVE_SMIME
-#include "smime.h"
-#endif
 #ifdef USE_HCACHE
 #include "hcache.h"
 #endif
diff --git a/version.c b/version.c
index bb0b3a23e..35544a8a5 100644
--- a/version.c
+++ b/version.c
@@ -194,11 +194,7 @@ static struct compile_options comp_opts[] = {
 #else
   { "HAVE_META", 0 },
 #endif
-#ifdef HAVE_REGCOMP
   { "HAVE_REGCOMP", 1 },
-#else
-  { "HAVE_REGCOMP", 0 },
-#endif
 #ifdef HAVE_RESIZETERM
   { "HAVE_RESIZETERM", 1 },
 #else