drop: --enable-smtp

Make SMTP feature built-in.

diff --git a/Makefile.am b/Makefile.am
index 130a38c59851fdb5b58c38d600bc6d0b79a9eaf2..080d9c1eabacf786d22a548abbc3d005abb8502a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_PROGRAMS = mutt_dotlock pgpring pgpewrap mutt_md5
 # Test the .tar file by building everything
 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-debug \
        --enable-gpgme --enable-notmuch \
-       --enable-smtp --with-bdb --with-gdbm \
+       --with-bdb --with-gdbm \
        --with-gnutls --with-gss --with-kyotocabinet --with-lmdb --with-qdbm \
        --with-sasl --with-tokyocabinet
 
@@ -41,7 +41,7 @@ mutt_SOURCES = account.c addrbook.c alias.c ascii.c attach.c base64.c bcache.c b
        mutt_idna.c mutt_sasl_plain.c mutt_socket.c mutt_tunnel.c mx.c newsrc.c nntp.c pager.c parse.c pattern.c \
        pop.c pop_auth.c pop_lib.c postpone.c query.c recvattach.c recvcmd.c rfc1524.c rfc2047.c \
        rfc2231.c rfc3676.c rfc822.c safe_asprintf.c score.c send.c sendlib.c \
-       sidebar.c signal.c sort.c status.c system.c thread.c url.c version.c
+       sidebar.c signal.c smtp.c sort.c status.c system.c thread.c url.c version.c
 
 nodist_mutt_SOURCES = $(BUILT_SOURCES)
 
@@ -66,7 +66,7 @@ EXTRA_mutt_SOURCES = browser.h \
        mutt_lua.c mutt_sasl.c mutt_notmuch.c mutt_ssl.c mutt_ssl_gnutls.c \
        pgp.c pgpinvoke.c pgpkey.c pgplib.c \
        pgpmicalg.c pgppacket.c remailer.c \
-       remailer.h resize.c sha1.c smime.c smtp.c url.h utf8.c wcwidth.c
+       remailer.h resize.c sha1.c smime.c url.h utf8.c wcwidth.c
 
 EXTRA_DIST = account.h ascii.h attach.h bcache.h browser.h buffer.h buffy.h ChangeLog \
        ChangeLog.neomutt ChangeLog.nntp charset.h compress.h config.rpath \

diff --git a/configure.ac b/configure.ac
index c29c98be6fc2b29c3b348a2792fc9364789da71b..a0a5bbaf61cb042264010d3e100078b9ae9f32c4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -133,7 +133,6 @@ AS_IF([test x$enable_everything = "xyes"], [
        use_pgp="yes"
        use_smime="yes"
        use_notmuch="yes"
-       use_smtp="yes"
        use_lua="yes"
        hcache_tokyocabinet="yes"
        hcache_kyotocabinet="yes"
@@ -146,7 +145,6 @@ AS_IF([test x$enable_everything = "xyes"], [
        use_pgp="no"
        use_smime="no"
        use_notmuch="no"
-       use_smtp="no"
        use_lua="no"
 ])
 
@@ -190,10 +188,6 @@ AC_ARG_ENABLE(notmuch,
        AC_HELP_STRING([--enable-notmuch], [Enable NOTMUCH support]),
        [use_notmuch=$enableval])
 
-AC_ARG_ENABLE(smtp,
-       AS_HELP_STRING([--enable-smtp], [Include internal SMTP relay support]),
-       [use_smtp=$enableval])
-
 AC_ARG_WITH(mixmaster,
        AS_HELP_STRING([--with-mixmaster@<:@=PATH@:>@], [Include Mixmaster support]),
        [alongwith_mixmaster=$withval], [alongwith_mixmaster=no])
@@ -237,6 +231,7 @@ AC_DEFINE(USE_IMAP, 1, [Define if you want support for the IMAP protocol.])
 AC_DEFINE(USE_NNTP, 1, [Define if you want support for the NNTP protocol.])
 AC_DEFINE(USE_POP, 1, [Define if you want support for the POP3 protocol.])
 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 ])
 
@@ -496,11 +491,6 @@ AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
 AC_CHECK_FUNCS(getaddrinfo)
 AC_SEARCH_LIBS([getaddrinfo_a], [anl], [AC_DEFINE(HAVE_GETADDRINFO_A, 1, [Define to 1 if you have the `getaddrinfo_a' function.])])
 
-AS_IF([test x$use_smtp = "xyes"], [
-       AC_DEFINE(USE_SMTP, 1, [Include internal SMTP relay support])
-       MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smtp.o"
-])
-
 dnl -- end socket dependencies --
 
 dnl -- imap dependencies --
@@ -1055,6 +1045,4 @@ AC_MSG_NOTICE([Summary of build options:
   Notmuch:           $use_notmuch
   Header Cache(s):   $hcache_db_used
   Lua:               $use_lua
-
-  SMTP:              $use_smtp
 ])