configure: drop --enable-imap

Make imap feature built-in.

diff --git a/Makefile.am b/Makefile.am
index c7e8f3540734e9eab21bdd61737c83a924865c97..ef6aa79b2afeaaecbc1308e65e1b2732361ebecd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,12 +7,12 @@ EXTRA_PROGRAMS = mutt_dotlock pgpring pgpewrap mutt_md5
 
 # Test the .tar file by building everything
 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-debug \
-       --enable-gpgme --enable-imap --enable-nntp --enable-notmuch \
+       --enable-gpgme --enable-nntp --enable-notmuch \
        --enable-pop --enable-smtp --with-bdb --with-gdbm \
        --with-gnutls --with-gss --with-kyotocabinet --with-lmdb --with-qdbm \
        --with-sasl --with-tokyocabinet
 
-SUBDIRS = m4 contrib hcache
+SUBDIRS = m4 contrib hcache imap
 
 if BUILD_DOC
 SUBDIRS += doc
@@ -22,10 +22,6 @@ if BUILD_PO
 SUBDIRS += po
 endif
 
-if BUILD_IMAP
-SUBDIRS += imap
-endif
-
 bin_SCRIPTS = $(SMIMEAUX_TARGET)
 
 DOTLOCK_GROUP='mail'
@@ -49,6 +45,9 @@ mutt_SOURCES = addrbook.c alias.c ascii.c attach.c base64.c browser.c buffer.c \
 
 nodist_mutt_SOURCES = $(BUILT_SOURCES)
 
+LIBIMAP = -Limap -limap
+LIBIMAPDEPS = $(top_srcdir)/imap/imap.h imap/libimap.a
+
 mutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAP) $(MUTTLIBS) \
        $(INTLLIBS) $(LIBICONV) $(GPGME_LIBS) $(HCACHE_LIBS)
 

diff --git a/configure.ac b/configure.ac
index 233b918aa4fb24f5a7235770bcc2c00e3ecdf9d9..e2d6539066a0d63e157caf97d20b038e3e95a724 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -134,7 +134,6 @@ AS_IF([test x$enable_everything = "xyes"], [
        use_smime="yes"
        use_notmuch="yes"
        use_pop="yes"
-       use_imap="yes"
        use_nntp="yes"
        use_smtp="yes"
        use_lua="yes"
@@ -150,7 +149,6 @@ AS_IF([test x$enable_everything = "xyes"], [
        use_smime="no"
        use_notmuch="no"
        use_pop="no"
-       use_imap="no"
        use_nntp="no"
        use_smtp="no"
        use_lua="no"
@@ -200,10 +198,6 @@ AC_ARG_ENABLE(pop,
        AS_HELP_STRING([--enable-pop], [Enable POP3 support]),
        [use_pop=$enableval])
 
-AC_ARG_ENABLE(imap,
-       AS_HELP_STRING([--enable-imap], [Enable IMAP support]),
-       [use_imap=$enableval])
-
 AC_ARG_ENABLE(nntp,
        AC_HELP_STRING([--enable-nntp], [Enable NNTP support]),
        [use_nntp=$enableval])
@@ -251,6 +245,10 @@ AS_IF([test x$use_smime != "xno"], [
 ])
 
 AC_DEFINE(USE_COMPRESSED, 1, [Define to enable compressed folders support.])
+AC_DEFINE(USE_IMAP, 1, [Define if you want support for the IMAP protocol.])
+need_imap="yes"
+need_socket="yes"
+need_md5="yes"
 AC_DEFINE(USE_SIDEBAR, 1, [Define if you want support for the sidebar.])
 
 dnl --enable-lua
@@ -519,16 +517,6 @@ AS_IF([test x$use_pop = "xyes"], [
        need_md5="yes"
 ])
 
-AS_IF([test x$use_imap = "xyes"], [
-       AC_DEFINE(USE_IMAP, 1, [Define if you want support for the IMAP protocol.])
-       LIBIMAP="-Limap -limap"
-       LIBIMAPDEPS="\$(top_srcdir)/imap/imap.h imap/libimap.a"
-       need_imap="yes"
-       need_socket="yes"
-       need_md5="yes"
-])
-AM_CONDITIONAL(BUILD_IMAP, test x$need_imap = xyes)
-
 AS_IF([test x$use_nntp = "xyes"], [
        AC_DEFINE(USE_NNTP, 1, [Define if you want support for the NNTP protocol.])
        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS nntp.o newsrc.o"
@@ -986,8 +974,6 @@ fi
 AC_SUBST(MUTT_MD5)
 AC_SUBST(MUTTLIBS)
 AC_SUBST(MUTT_LIB_OBJECTS)
-AC_SUBST(LIBIMAP)
-AC_SUBST(LIBIMAPDEPS)
 AC_SUBST(HCACHE_LIBS)
 
 dnl -- iconv/gettext --
@@ -1131,7 +1117,6 @@ AC_MSG_NOTICE([Summary of build options:
   Lua:               $use_lua
 
   POP3:              $use_pop
-  IMAP:              $use_imap
   NNTP:              $use_nntp
   SMTP:              $use_smtp
 ])