From: toogley <toogley@mailbox.org>
Date: Fri, 28 Apr 2017 13:21:59 +0000 (+0200)
Subject: build: remove --enable-mailtool configure option
X-Git-Tag: neomutt-20170526~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f286d23e6f8559071f19da0ff286f5f2e2ec8d3;p=neomutt

build: remove --enable-mailtool configure option

Leave the code enabled, but hide the option.
The feature may be useful to someone.
The code isn't complicated or risky.
---

diff --git a/configure.ac b/configure.ac
index 553ca34ec..910bff4dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,6 +221,7 @@ AC_DEFINE(USE_SIDEBAR, 1, [Define if you want support for the sidebar.])
 AC_DEFINE(USE_SMTP, 1, [Include internal SMTP relay support])
 AC_DEFINE(USE_SOCKET,1,
 	[ Include code for socket support. Set automatically if you enable POP3 or IMAP ])
+AC_DEFINE(SUN_ATTACHMENT,1,[ Define to enable Sun mailtool attachments support. ])
 
 dnl --enable-lua
 AS_IF([test x$use_lua = "xyes"], [
@@ -637,11 +638,6 @@ AC_ARG_ENABLE(nfs-fix, AS_HELP_STRING([--enable-nfs-fix],[Work around an NFS wit
 			incorrectly cache the attributes of small files.])
 	fi])
 
-AC_ARG_ENABLE(mailtool, AS_HELP_STRING([--enable-mailtool],[Enable Sun mailtool attachments support]),
-	[if test x$enableval = xyes; then
-		AC_DEFINE(SUN_ATTACHMENT,1,[ Define to enable Sun mailtool attachments support. ])
-	fi])
-
 AC_ARG_ENABLE(locales-fix, AS_HELP_STRING([--enable-locales-fix],[The result of isprint() is unreliable]),
 	[if test x$enableval = xyes; then
 		AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
diff --git a/version.c b/version.c
index c1645fbea..1984a4340 100644
--- a/version.c
+++ b/version.c
@@ -282,8 +282,6 @@ static struct compile_options comp_opts[] = {
   { "status_color", 1 },
 #ifdef SUN_ATTACHMENT
   { "sun_attachment", 1 },
-#else
-  { "sun_attachment", 0 },
 #endif
   { "timeout", 1 },
   { "tls_sni", 1 },