From: Timo Sirainen <tss@iki.fi>
Date: Mon, 20 Apr 2015 14:33:09 +0000 (+0300)
Subject: lib-fts: Fixed test-fts-language to use TEXTCAT_DATADIR
X-Git-Tag: 2.2.17.rc1~201
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e07da7f29d35d1517fce9b7300c6c19f804325b;p=thirdparty%2Fdovecot%2Fcore.git

lib-fts: Fixed test-fts-language to use TEXTCAT_DATADIR
This may still make too many assumptions about what data exists where.. So
we may need to remove this test from "make check". But for now leave it
there.
---

diff --git a/src/lib-fts/Makefile.am b/src/lib-fts/Makefile.am
index df26669793..87a1025dbe 100644
--- a/src/lib-fts/Makefile.am
+++ b/src/lib-fts/Makefile.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
 	$(LIBFTS_NORMALIZER_CFLAGS) \
 	-DUDHRDIR=\""$(top_srcdir)/src/lib-fts"\" \
 	-DDATADIR=\"$(pkgdatadir)\" \
-	-DTEST_TEXTCAT_DIR=\""$(top_srcdir)/ext/libexttextcat/langclass"\" \
 	-DTEST_STOPWORDS_DIR=\""$(top_srcdir)/src/lib-fts"\"
 
 stopwordsdir = $(datadir)/${PACKAGE_TARNAME}/stopwords
diff --git a/src/lib-fts/test-fts-language.c b/src/lib-fts/test-fts-language.c
index bf9de79d00..bef5d25927 100644
--- a/src/lib-fts/test-fts-language.c
+++ b/src/lib-fts/test-fts-language.c
@@ -7,8 +7,8 @@
    As such, they are not really unit test to be coupled with the build. */
 
 const char *const settings[] =
-	{"fts_language_config", TEST_TEXTCAT_DIR"/fpdb.conf",
-	 "fts_language_data", TEST_TEXTCAT_DIR"/LM/", NULL};
+	{"fts_language_config", TEXTCAT_DATADIR"/fpdb.conf",
+	 "fts_language_data", TEXTCAT_DATADIR"/", NULL};
 
 /* Detect Finnish. fi--utf8 */
 static void test_fts_language_detect_finnish(void)