configure: need_md5 is now always built-in

md5 was dependent on other features to be built or not. Now that imap is
built-in, we will always need md5 as built-in as well.

diff --git a/Makefile.am b/Makefile.am
index ef6aa79b2afeaaecbc1308e65e1b2732361ebecd..986c2d8d3220ca593f65f64417a3d8327a83f47b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,7 @@ mutt_SOURCES = addrbook.c alias.c ascii.c attach.c base64.c browser.c buffer.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 \
        group.c handler.c hash.c hdrline.c headers.c help.c history.c hook.c \
-       init.c keymap.c lib.c main.c mbox.c mbyte.c menu.c mh.c muttlib.c \
+       init.c keymap.c lib.c main.c mbox.c mbyte.c md5.c menu.c mh.c muttlib.c \
        mutt_idna.c mutt_sasl_plain.c mx.c pager.c parse.c pattern.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 \
@@ -62,7 +62,7 @@ AM_CPPFLAGS=-I. -I$(top_srcdir) $(GPGME_CFLAGS)
 EXTRA_mutt_SOURCES = account.c bcache.c bcache.h 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 md5.c mutt_idna.c mutt_idna.h \
+       gnupgparse.c mbyte.h mutt_idna.c mutt_idna.h \
        mutt_lua.c mutt_sasl.c mutt_notmuch.c mutt_socket.c mutt_ssl.c mutt_ssl_gnutls.c \
        mutt_tunnel.c newsrc.c nntp.c pgp.c pgpinvoke.c pgpkey.c pgplib.c \
        pgpmicalg.c pgppacket.c pop.c pop_auth.c pop_lib.c remailer.c \

diff --git a/configure.ac b/configure.ac
index e2d6539066a0d63e157caf97d20b038e3e95a724..49e4318d0a073ddf1d94aa6ab040fbc9138f895a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -248,7 +248,6 @@ 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
@@ -514,7 +513,6 @@ AS_IF([test x$use_pop = "xyes"], [
        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pop.o pop_lib.o pop_auth.o"
        need_pop="yes"
        need_socket="yes"
-       need_md5="yes"
 ])
 
 AS_IF([test x$use_nntp = "xyes"], [
@@ -952,7 +950,6 @@ AM_CONDITIONAL(BUILD_HCACHE, test -n "$hcache_db_used")
 if test -n "$hcache_db_used"; then
        AC_DEFINE(USE_HCACHE, 1, [Enable header caching])
        HCACHE_LIBS="-Lhcache -lhcache $HCACHE_LIBS"
-       need_md5="yes"
 else
        # For outputting in the summary
        hcache_db_used="no"
@@ -966,10 +963,7 @@ AM_CONDITIONAL(BUILD_HC_QDBM, test "x$build_hc_qdbm" = "xyes")
 AM_CONDITIONAL(BUILD_HC_TC,   test "x$build_hc_tc"   = "xyes")
 dnl -- end cache --
 
-if test "$need_md5" = "yes"; then
-       MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS md5.o"
-       MUTT_MD5="mutt_md5$EXEEXT"
-fi
+MUTT_MD5="mutt_md5$EXEEXT"
 
 AC_SUBST(MUTT_MD5)
 AC_SUBST(MUTTLIBS)