dovecot-2.2: lib-fts: Fixed default textcat datadir paths.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/cf04173f3f69
changeset: 18417:cf04173f3f69
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Apr 20 17:01:12 2015 +0300
description:
lib-fts: Fixed default textcat datadir paths.

diffstat:

 configure.ac               |  4 ++++
 src/lib-fts/fts-language.c |  4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (46 lines):

diff -r b93306938a88 -r cf04173f3f69 configure.ac
--- a/configure.ac	Mon Apr 20 16:34:31 2015 +0300
+++ b/configure.ac	Mon Apr 20 17:01:12 2015 +0300
@@ -2767,16 +2767,19 @@
 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 @@
   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 -r b93306938a88 -r cf04173f3f69 src/lib-fts/fts-language.c
--- a/src/lib-fts/fts-language.c	Mon Apr 20 16:34:31 2015 +0300
+++ b/src/lib-fts/fts-language.c	Mon Apr 20 17:01:12 2015 +0300
@@ -191,9 +191,9 @@
 		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",