From 5437fa7c354b5ddf12b4e13136834d86168e3580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@redhat.com>
Date: Mon, 8 Oct 2012 23:27:29 +0200
Subject: Bug #684447 - Check for highlight during configure.

If the highlight program cannot be found width AC_PATH_PROGS,
configure will abort with an error message.

You can either
a) install highlight
b) specify the patch with HIGHLIGHT=/path/to/highlight
c) pass --disable-text-highlight to configure to exclude the module

This also makes text-highlight module to fallback to text/plain
formatter when highlight program would crash or fail to ensure
the content is delivered to user.
---
 modules/Makefile.am | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'modules/Makefile.am')

diff --git a/modules/Makefile.am b/modules/Makefile.am
index a7e34de52b..6bb19c8071 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -26,6 +26,10 @@ if ENABLE_AUDIO_INLINE
 AUDIO_INLINE_DIR = audio-inline
 endif
 
+if ENABLE_TEXT_HIGHLIGHT
+TEXT_HIGHLIGHT_DIR = text-highlight
+endif
+
 SUBDIRS = \
 	addressbook \
 	calendar \
@@ -52,13 +56,13 @@ SUBDIRS = \
 	plugin-manager \
 	prefer-plain \
 	startup-wizard \
-	text-highlight \
 	vcard-inline \
 	web-inspector \
 	$(BOGOFILTER_DIR) \
 	$(ONLINE_ACCOUNTS_DIR) \
 	$(SPAMASSASSIN_DIR) \
 	$(TNEF_ATTACHMENT_DIR) \
-	$(AUDIO_INLINE_DIR)
+	$(AUDIO_INLINE_DIR) \
+	$(TEXT_HIGHLIGHT_DIR)
 
 -include $(top_srcdir)/git.mk
-- 
cgit v1.2.3