configure: drop --enable-compressed

Make compression feature built-in.

diff --git a/Makefile.am b/Makefile.am
index a71ed71941f99dc574a61071e3fb7134dea685c9..c7e8f3540734e9eab21bdd61737c83a924865c97 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
 EXTRA_PROGRAMS = mutt_dotlock pgpring pgpewrap mutt_md5
 
 # Test the .tar file by building everything
-AM_DISTCHECK_CONFIGURE_FLAGS = --enable-compressed --enable-debug \
+AM_DISTCHECK_CONFIGURE_FLAGS = --enable-debug \
        --enable-gpgme --enable-imap --enable-nntp --enable-notmuch \
        --enable-pop --enable-smtp --with-bdb --with-gdbm \
        --with-gnutls --with-gss --with-kyotocabinet --with-lmdb --with-qdbm \
@@ -37,7 +37,7 @@ BUILT_SOURCES = keymap_defs.h keymap_alldefs.h patchlist.c git_ver.h conststring
 
 bin_PROGRAMS = mutt $(DOTLOCK_TARGET) $(PGPAUX_TARGET)
 mutt_SOURCES = addrbook.c alias.c ascii.c attach.c base64.c browser.c buffer.c \
-       buffy.c charset.c color.c commands.c complete.c compose.c copy.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 \
        group.c handler.c hash.c hdrline.c headers.c help.c history.c hook.c \
@@ -60,7 +60,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 compress.c \
+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 \

diff --git a/configure.ac b/configure.ac
index f74dbc6fff1f5357fedbaae79dcc6d582d16e17b..233b918aa4fb24f5a7235770bcc2c00e3ecdf9d9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -132,7 +132,6 @@ AS_IF([test x$enable_everything = "xyes"], [
        use_gpgme="yes"
        use_pgp="yes"
        use_smime="yes"
-       use_compressed="yes"
        use_notmuch="yes"
        use_pop="yes"
        use_imap="yes"
@@ -149,7 +148,6 @@ AS_IF([test x$enable_everything = "xyes"], [
        use_gpgme="no"
        use_pgp="no"
        use_smime="no"
-       use_compressed="no"
        use_notmuch="no"
        use_pop="no"
        use_imap="no"
@@ -194,10 +192,6 @@ AC_ARG_ENABLE(lua,
        AC_HELP_STRING([--enable-lua], [Enable lua scripting support]),
        [use_lua=$enableval])
 
-AC_ARG_ENABLE(compressed,
-       AC_HELP_STRING([--enable-compressed], [Enable compressed folders support]),
-       [use_compressed=$enableval])
-
 AC_ARG_ENABLE(notmuch,
        AC_HELP_STRING([--enable-notmuch], [Enable NOTMUCH support]),
        [use_notmuch=$enableval])
@@ -256,15 +250,9 @@ AS_IF([test x$use_smime != "xno"], [
        SMIMEAUX_TARGET="smime_keys"
 ])
 
+AC_DEFINE(USE_COMPRESSED, 1, [Define to enable compressed folders support.])
 AC_DEFINE(USE_SIDEBAR, 1, [Define if you want support for the sidebar.])
 
-dnl --enable-compressed
-AS_IF([test x$use_compressed = "xyes"], [
-       AC_DEFINE(USE_COMPRESSED, 1, [Define to enable compressed folders support.])
-       MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS compress.o"
-])
-AM_CONDITIONAL(BUILD_COMPRESS, test x$enable_compressed = xyes)
-
 dnl --enable-lua
 AS_IF([test x$use_lua = "xyes"], [
        AX_PROG_LUA([5.2],[],:,enable_lua=no)
@@ -1139,7 +1127,6 @@ AC_MSG_NOTICE([Summary of build options:
   PGP:               $use_pgp
   SMIME:             $use_smime
   Notmuch:           $use_notmuch
-  Compressed Folder: $use_compressed
   Header Cache(s):   $hcache_db_used
   Lua:               $use_lua