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 5b483c3adb711b62df289e0cebb50fe527d986d4..b53773728aa281e511feec44363fee96eb48c9cf 100644 (file)
--- 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 c487e1ca9e561bd923f311d851a41c6452a0f677..1d36639c08e3842210ad080ead4544f14fcc92a1 100644 (file)
--- 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;