From 0d0654c19f7d966110cebed882b6a6e80f5e4198 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 20 Aug 2012 12:28:17 -0400 Subject: Check for SpamAssassin during configure. If the spamassassin and sa-learn programs cannot be found with AC_PATH_PROG, configure will abort with an error message. You can then either: a) install the SpamAssassin software b) specify the path with SPAMASSASSIN=/path/to/spamassassin and/or SA_LEARN=/path/to/sa-learn c) pass --disable-spamassassin to configure to exclude the module This also drops the "spamc" and "spamd" GSettings keys. --- modules/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'modules/Makefile.am') diff --git a/modules/Makefile.am b/modules/Makefile.am index b2ec916038..a7e34de52b 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -14,6 +14,10 @@ if ENABLE_ONLINE_ACCOUNTS ONLINE_ACCOUNTS_DIR = online-accounts endif +if ENABLE_SPAMASSASSIN +SPAMASSASSIN_DIR = spamassassin +endif + if ENABLE_TNEF TNEF_ATTACHMENT_DIR = tnef-attachment endif @@ -47,13 +51,13 @@ SUBDIRS = \ plugin-lib \ plugin-manager \ prefer-plain \ - spamassassin \ startup-wizard \ text-highlight \ vcard-inline \ web-inspector \ $(BOGOFILTER_DIR) \ $(ONLINE_ACCOUNTS_DIR) \ + $(SPAMASSASSIN_DIR) \ $(TNEF_ATTACHMENT_DIR) \ $(AUDIO_INLINE_DIR) -- cgit v1.2.3