Added --enable-recieve-strip configure option (Ansgar Burchardt)

diff --git a/ChangeLog b/ChangeLog
index 89afe58f176c923042892e69a4a956340196f12c..478b34771135212193c59bf45aa604a8d08b7671 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+ o Added --enable-recieve-strip configure option (Ansgar Burchardt)
  o Added unicode support to listtexts
  o Fixed build outside the source directory (Ansgar Burchardt)
  o Moved English listtexts and install all languages (Ansgar Burchardt)

diff --git a/README b/README
index 981aa54ab60722da5e4fedd39bf3773ca57784b9..0b5a0bbcb2cd14ea697b88d91225222306d92fd6 100644 (file)
--- a/README
+++ b/README
@@ -29,6 +29,10 @@ To use mlmmj, do the following:
 
     $ ./configure && make && make install
 
+               If you want to filter multipart/mime messages, pass the option
+               --enable-recieve-strip to configure, and take a look at
+               contrib/recievestrip/README.
+
  1) Configure a recipient delimiter. The default is to use '+', and in
     Postfix it's done by adding
 

diff --git a/configure.ac b/configure.ac
index 8449b099c9cc69c11e78ebcbbbd00ebf0fb74931..289648df61318dcd5fbe1b1b85e2ff177dc2f64b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,11 @@ exec_prefix=$savex
 
 AC_SUBST(textlibdir)
 
+AC_ARG_ENABLE([recieve-strip],
+  AS_HELP_STRING([--enable-recieve-strip],
+                 [build mlmmj-recieve-strip (default is no)]))
+AM_CONDITIONAL(WANT_RECIEVESTRIP, test x"$enable_recieve_strip" = xyes)
+
 # Checks for library functions.
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([ftruncate memset socket strerror strncasecmp snprintf fcntl])

diff --git a/contrib/recievestrip/Makefile.am b/contrib/recievestrip/Makefile.am
index 94bb9e41e992ba66f405618c576ec214c25945a5..e672edb59533eaf4790e2b8a28dfc43bf1a4f4ed 100644 (file)
--- a/contrib/recievestrip/Makefile.am
+++ b/contrib/recievestrip/Makefile.am
@@ -5,7 +5,9 @@ AUTOMAKE_OPTIONS = foreign
 AM_CFLAGS = -g -Wall -pedantic -Wsign-compare -DDEFAULTTEXTDIR='"@textlibdir@"'
 INCLUDES = -I$(srcdir)/../../include
 
-noinst_PROGRAMS = mlmmj-recieve-strip
+if WANT_RECIEVESTRIP
+  bin_PROGRAMS = mlmmj-recieve-strip
+endif
 
 mlmmj_recieve_strip_SOURCES = mlmmj-recieve-strip.c ../../src/mygetline.c ../../src/memory.c ../../src/readn.c  \
                                ../../src/strgen.c ../../src/random-int.c  ../../src/log_error.c ../../src/print-version.c \

diff --git a/src/Makefile.in b/src/Makefile.in
index 9be13f039cf107a4103bbdb33632b714130c09a3..3181c983ee525254ac3927c1b51c8429567ef1e1 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -79,6 +79,8 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+WANT_RECIEVESTRIP_FALSE = @WANT_RECIEVESTRIP_FALSE@
+WANT_RECIEVESTRIP_TRUE = @WANT_RECIEVESTRIP_TRUE@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@