From: Timo Sirainen <tss@iki.fi>
Date: Mon, 20 Apr 2015 15:08:56 +0000 (+0300)
Subject: lib-fts requires libexttextcat actually - don't even try to use textcat for it.
X-Git-Tag: 2.2.17.rc1~195
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82eadbc4311faf7719d5db33fddaa06cb3a7010b;p=thirdparty%2Fdovecot%2Fcore.git

lib-fts requires libexttextcat actually - don't even try to use textcat for it.
I'm also not sure yet if some libexttextcats are too old for it.
---

diff --git a/configure.ac b/configure.ac
index 5b483c3adb..b53773728a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2768,6 +2768,7 @@ if test $want_textcat != no; then
   if test "$PKG_CONFIG" != "" && $PKG_CONFIG --exists libexttextcat 2>/dev/null; then
     PKG_CHECK_MODULES(LIBEXTTEXTCAT, libexttextcat)
     TEXTCAT_DATADIR=`$PKG_CONFIG --variable=pkgdatadir libexttextcat`
+    AC_DEFINE(HAVE_FTS_EXTTEXTCAT,, Define if you want exttextcat support for FTS)
     have_fts_exttextcat=yes
     # Debian Wheezy workaround - LIBEXTTEXTCAT_CFLAGS include path is wrong:
     AC_CHECK_HEADERS(libexttextcat/textcat.h)
@@ -2776,6 +2777,7 @@ if test $want_textcat != no; then
       have_fts_exttextcat=yes
       AC_CHECK_HEADERS(libexttextcat/textcat.h)
       LIBEXTTEXTCAT_LIBS=-lexttextcat
+      AC_DEFINE(HAVE_FTS_EXTTEXTCAT,, Define if you want exttextcat support for FTS)
       TEXTCAT_DATADIR="/usr/share/libexttextcat"
       AC_SUBST(LIBEXTTEXTCAT_LIBS)
     ], [
diff --git a/src/lib-fts/fts-language.c b/src/lib-fts/fts-language.c
index c487e1ca9e..1d36639c08 100644
--- a/src/lib-fts/fts-language.c
+++ b/src/lib-fts/fts-language.c
@@ -8,13 +8,8 @@
 
 #ifdef HAVE_LIBEXTTEXTCAT_TEXTCAT_H
 #  include <libexttextcat/textcat.h>
-#  define HAVE_TEXTCAT
-#elif defined (HAVE_LIBTEXTCAT_TEXTCAT_H)
-#  include <libtextcat/textcat.h>
-#  define HAVE_TEXTCAT
-#elif defined (HAVE_FTS_TEXTCAT)
+#elif defined (HAVE_FTS_EXTTEXTCAT)
 #  include <textcat.h>
-#  define HAVE_TEXTCAT
 #endif
 
 #ifndef TEXTCAT_RESULT_UNKNOWN /* old textcat.h has typos */
@@ -99,7 +94,7 @@ void fts_language_list_deinit(struct fts_language_list **list)
 	struct fts_language_list *lp = *list;
 
 	*list = NULL;
-#ifdef HAVE_TEXTCAT
+#ifdef HAVE_FTS_EXTTEXTCAT
 	if (lp->textcat_handle != NULL)
 		textcat_Done(lp->textcat_handle);
 #endif
@@ -160,7 +155,7 @@ fts_language_list_get_first(struct fts_language_list *list)
 	return *langp;
 }
 
-#ifdef HAVE_TEXTCAT
+#ifdef HAVE_FTS_EXTTEXTCAT
 static bool fts_language_match_lists(struct fts_language_list *list,
                                      candidate_t *candp, int candp_len,
                                      const struct fts_language **lang_r)
@@ -178,7 +173,7 @@ static bool fts_language_match_lists(struct fts_language_list *list,
 }
 #endif
 
-#ifdef HAVE_TEXTCAT
+#ifdef HAVE_FTS_EXTTEXTCAT
 static int fts_language_textcat_init(struct fts_language_list *list)
 {
 	const char *config_path;
@@ -213,7 +208,7 @@ fts_language_detect_textcat(struct fts_language_list *list ATTR_UNUSED,
 			    size_t size ATTR_UNUSED,
 			    const struct fts_language **lang_r ATTR_UNUSED)
 {
-#ifdef HAVE_TEXTCAT
+#ifdef HAVE_FTS_EXTTEXTCAT
 	candidate_t *candp; /* textcat candidate result array pointer */
 	int cnt;
 	bool match = FALSE;