From: Timo Sirainen <tss@iki.fi>
Date: Tue, 9 Aug 2011 16:28:00 +0000 (+0300)
Subject: fts-lucene: Fixed compiling without textcat/snowball
X-Git-Tag: 2.1.alpha1~152
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ce5b1d19cba4654239116a34e3ad9d5b6af8551;p=thirdparty%2Fdovecot%2Fcore.git

fts-lucene: Fixed compiling without textcat/snowball
---

diff --git a/src/plugins/fts-lucene/Makefile.am b/src/plugins/fts-lucene/Makefile.am
index 015c8bfce4..2c303521ee 100644
--- a/src/plugins/fts-lucene/Makefile.am
+++ b/src/plugins/fts-lucene/Makefile.am
@@ -14,6 +14,7 @@ module_LTLIBRARIES = \
 
 if BUILD_LUCENE_TEXTCAT
 TEXTCAT_LIBS = -lstemmer -ltextcat
+SHOWBALL_SOURCES = Snowball.cc
 endif
 
 lib21_fts_lucene_plugin_la_LIBADD = \
@@ -23,7 +24,7 @@ lib21_fts_lucene_plugin_la_SOURCES = \
 	fts-lucene-plugin.c \
 	fts-backend-lucene.c \
 	lucene-wrapper.cc \
-	Snowball.cc
+	$(SHOWBALL_SOURCES)
 
 noinst_HEADERS = \
 	fts-lucene-plugin.h \
diff --git a/src/plugins/fts-lucene/lucene-wrapper.cc b/src/plugins/fts-lucene/lucene-wrapper.cc
index 9763677e78..cf40c5ee46 100644
--- a/src/plugins/fts-lucene/lucene-wrapper.cc
+++ b/src/plugins/fts-lucene/lucene-wrapper.cc
@@ -13,7 +13,9 @@ extern "C" {
 
 #include <dirent.h>
 #include <sys/stat.h>
-#include <libtextcat/textcat.h>
+#ifdef HAVE_LUCENE_TEXTCAT
+#  include <libtextcat/textcat.h>
+#endif
 };
 #include <CLucene.h>
 #include <CLucene/util/CLStreams.h>