configure: drop need_imap

Imap being built-in, body cache is too.

diff --git a/Makefile.am b/Makefile.am
index 986c2d8d3220ca593f65f64417a3d8327a83f47b..a43879ce0906c6a8aa3cc124e34b4d2d7dc1d720 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ distdir = neo$(PACKAGE)-$(VERSION)
 BUILT_SOURCES = keymap_defs.h keymap_alldefs.h patchlist.c git_ver.h conststrings.c
 
 bin_PROGRAMS = mutt $(DOTLOCK_TARGET) $(PGPAUX_TARGET)
-mutt_SOURCES = addrbook.c alias.c ascii.c attach.c base64.c browser.c buffer.c \
+mutt_SOURCES = addrbook.c alias.c ascii.c attach.c base64.c bcache.c browser.c buffer.c \
        buffy.c charset.c color.c commands.c complete.c compose.c compress.c copy.c \
        crypt_mod.c crypt_mod.h crypt.c cryptglue.c curs_lib.c curs_main.c \
        date.c edit.c editmsg.c enter.c filter.c flags.c from.c getdomain.c \
@@ -59,7 +59,7 @@ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
 
 AM_CPPFLAGS=-I. -I$(top_srcdir) $(GPGME_CFLAGS)
 
-EXTRA_mutt_SOURCES = account.c bcache.c bcache.h browser.h \
+EXTRA_mutt_SOURCES = account.c browser.h \
        crypt_gpgme.c crypt_mod_pgp_classic.c crypt_mod_pgp_gpgme.c \
        crypt_mod_smime_classic.c crypt_mod_smime_gpgme.c dotlock.c \
        gnupgparse.c mbyte.h mutt_idna.c mutt_idna.h \
@@ -68,7 +68,7 @@ EXTRA_mutt_SOURCES = account.c bcache.c bcache.h browser.h \
        pgpmicalg.c pgppacket.c pop.c pop_auth.c pop_lib.c remailer.c \
        remailer.h resize.c sha1.c smime.c smtp.c url.h utf8.c wcwidth.c
 
-EXTRA_DIST = account.h ascii.h attach.h browser.h buffer.h buffy.h ChangeLog \
+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 \
        copy.h COPYRIGHT crypt_gpgme.h crypthash.h depcomp dotlock.h extlib.c \
        filter.h functions.h gen_defs globals.h group.h hash.h \

diff --git a/configure.ac b/configure.ac
index 49e4318d0a073ddf1d94aa6ab040fbc9138f895a..51d833bbe2b296a667f155f18344d81d8e0afc81 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -246,7 +246,6 @@ 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"
 AC_DEFINE(USE_SIDEBAR, 1, [Define if you want support for the sidebar.])
 
@@ -529,10 +528,6 @@ AS_IF([test x$use_smtp = "xyes"], [
        need_socket="yes"
 ])
 
-if test x"$need_imap" = xyes -o x"$need_pop" = xyes -o x"$need_nntp" = xyes; then
-       MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS bcache.o"
-fi
-
 dnl -- end socket dependencies --
 
 if test "$need_socket" = "yes"; then
@@ -546,24 +541,20 @@ dnl -- imap dependencies --
 AC_ARG_WITH(gss, AS_HELP_STRING([--with-gss@<:@=PFX@:>@],[Compile in GSSAPI authentication for IMAP]),
        gss_prefix="$withval", gss_prefix="no")
 if test "$gss_prefix" != "no"; then
-       if test "$need_imap" = "yes"; then
-               MUTT_AM_PATH_GSSAPI(gss_prefix)
-               AC_MSG_CHECKING(GSSAPI implementation)
-               AC_MSG_RESULT($GSSAPI_IMPL)
-               if test "$GSSAPI_IMPL" = "none"; then
-                       AC_CACHE_SAVE
-                       AC_MSG_RESULT([GSSAPI libraries not found])
-               fi
-               if test "$GSSAPI_IMPL" = "Heimdal"; then
-                       AC_DEFINE(HAVE_HEIMDAL,1,[ Define if your GSSAPI implementation is Heimdal ])
-               fi
-               CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
-               MUTTLIBS="$MUTTLIBS $GSSAPI_LIBS"
-               AC_DEFINE(USE_GSS,1,[ Define if you have GSSAPI libraries available ])
-               need_gss="yes"
-       else
-               AC_MSG_WARN([GSS was requested but IMAP is not enabled])
+       MUTT_AM_PATH_GSSAPI(gss_prefix)
+       AC_MSG_CHECKING(GSSAPI implementation)
+       AC_MSG_RESULT($GSSAPI_IMPL)
+       if test "$GSSAPI_IMPL" = "none"; then
+               AC_CACHE_SAVE
+               AC_MSG_RESULT([GSSAPI libraries not found])
+       fi
+       if test "$GSSAPI_IMPL" = "Heimdal"; then
+               AC_DEFINE(HAVE_HEIMDAL,1,[ Define if your GSSAPI implementation is Heimdal ])
        fi
+       CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
+       MUTTLIBS="$MUTTLIBS $GSSAPI_LIBS"
+       AC_DEFINE(USE_GSS,1,[ Define if you have GSSAPI libraries available ])
+       need_gss="yes"
 fi
 AM_CONDITIONAL(USE_GSS, test x$need_gss = xyes)