compress build

diff --git a/Makefile.am b/Makefile.am
index d36e7c6318f80574838e3bdb6ba39dd188c22ff6..173471378a78aeb0bb25d3ecee7f1904402282ee 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,7 +50,7 @@ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
 
 AM_CPPFLAGS=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(GPGME_CFLAGS) -Iintl
 
-EXTRA_mutt_SOURCES = account.c bcache.c crypt-gpgme.c crypt-mod-pgp-classic.c \
+EXTRA_mutt_SOURCES = account.c bcache.c compress.c 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 hcache.c md5.c \
        mutt_idna.c mutt_sasl.c mutt_socket.c mutt_ssl.c mutt_ssl_gnutls.c \
@@ -61,7 +61,7 @@ EXTRA_mutt_SOURCES = account.c bcache.c crypt-gpgme.c crypt-mod-pgp-classic.c \
 
 EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \
        configure account.h \
-       attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \
+       attach.h buffy.h charset.h compress.h copy.h crypthash.h dotlock.h functions.h gen_defs \
        globals.h hash.h history.h init.h keymap.h mutt_crypt.h \
        mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \
        mutt_regex.h mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
@@ -77,11 +77,6 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \
 
 EXTRA_SCRIPTS = smime_keys
 
-if BUILD_COMPRESS
-mutt_SOURCES += compress.c compress.h
-endif
-
-
 mutt_dotlock_SOURCES = mutt_dotlock.c
 mutt_dotlock_LDADD = $(LIBOBJS)
 mutt_dotlock_DEPENDENCIES = $(LIBOBJS)

diff --git a/configure.ac b/configure.ac
index 6f2d63c555ec1763f46965e95ba0c93908afaa10..88700ccc35f96bd53c32b61f41ff6c414bf2f7c2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -177,8 +177,8 @@ fi
 
 AC_ARG_ENABLE(compressed, AC_HELP_STRING([--enable-compressed], [Enable compressed folders support]),
 [       if test x$enableval = xyes ; then
-                AC_DEFINE(USE_COMPRESSED,1, [ Define to enable compressed folders support. ])
-               need_compress="yes"
+                AC_DEFINE(USE_COMPRESSED, 1, [Define to enable compressed folders support.])
+                MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS compress.o"
         fi
 ])
 AM_CONDITIONAL(BUILD_COMPRESS, test x$need_compress = xyes)