lib-fts: Fixed default textcat datadir paths.

diff --git a/configure.ac b/configure.ac
index d924538c53623a26278da1afbb0850cf5d998565..1eff6a233f0d27e40ccd6e2585c568d3a8ee85ee 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2767,16 +2767,19 @@ AM_CONDITIONAL(BUILD_FTS_STEMMER, test "$have_fts_stemmer" = "yes")
 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`
     have_fts_exttextcat=yes
   else
     AC_CHECK_LIB(exttextcat, special_textcat_Init, [
       have_fts_exttextcat=yes
       AC_CHECK_HEADERS(libexttextcat/textcat.h)
       LIBEXTTEXTCAT_LIBS=-lexttextcat
+      TEXTCAT_DATADIR="/usr/share/libexttextcat"
       AC_SUBST(LIBEXTTEXTCAT_LIBS)
     ], [
       AC_CHECK_LIB(textcat, special_textcat_Init, [
        have_fts_textcat=yes
+        TEXTCAT_DATADIR="/usr/share/libtextcat"
         AC_CHECK_HEADERS(libtextcat/textcat.h)
       ])
     ])
@@ -2786,6 +2789,7 @@ if test $want_textcat != no; then
   fi
   if test "$have_fts_exttextcat" != yes || test "$have_fts_textcat" != yes; then
     AC_DEFINE(HAVE_FTS_TEXTCAT,, Define if you want textcat support for FTS)
+    AC_DEFINE_UNQUOTED(TEXTCAT_DATADIR, "$TEXTCAT_DATADIR", Points to textcat pkgdatadir containing the language files)
   fi
 fi
 AM_CONDITIONAL(BUILD_FTS_TEXTCAT, test "$have_fts_textcat" = "yes")

diff --git a/src/lib-fts/fts-language.c b/src/lib-fts/fts-language.c
index dd2302facc33939e04da8c8ca4a3f998013bf381..c487e1ca9e561bd923f311d851a41c6452a0f677 100644 (file)
--- a/src/lib-fts/fts-language.c
+++ b/src/lib-fts/fts-language.c
@@ -191,9 +191,9 @@ static int fts_language_textcat_init(struct fts_language_list *list)
                return -1;
            
        config_path = list->textcat_config != NULL ? list->textcat_config :
-               DATADIR"/libexttextcat/fpdb.conf";
+               TEXTCAT_DATADIR"/fpdb.conf";
        data_dir = list->textcat_datadir != NULL ? list->textcat_datadir :
-               DATADIR"/libexttextcat/";
+               TEXTCAT_DATADIR"/";
        list->textcat_handle = special_textcat_Init(config_path, data_dir);
        if (list->textcat_handle == NULL) {
                i_error("special_textcat_Init(%s, %s) failed",