configure: s/normalizer/libicu/ since we it could be used for something else as well.

diff --git a/configure.ac b/configure.ac
index b53773728aa281e511feec44363fee96eb48c9cf..03ba018d5a1d671455ce5b47b9d0db6295869342 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -169,10 +169,10 @@ AS_HELP_STRING([--with-textcat], [Build with libtextcat support (for FTS) (auto)
   TEST_WITH(textcat, $withval),
   want_textcat=auto)
 
-AC_ARG_WITH(normalizer,
-AS_HELP_STRING([--with-normalizer], [Build lib-fts with ICU normalization support (auto)]),
-  want_fts_normalizer=$withval,
-  want_fts_normalizer=auto)
+AC_ARG_WITH(icu,
+AS_HELP_STRING([--with-icu], [Build with libicu support (for FTS normalization) (auto)]),
+  want_icu=$withval,
+  want_icu=auto)
 
 AC_ARG_WITH(solr,
 AS_HELP_STRING([--with-solr], [Build with Solr full text search support]),
@@ -2799,16 +2799,16 @@ fi
 AM_CONDITIONAL(BUILD_FTS_TEXTCAT, test "$have_fts_textcat" = "yes")
 AM_CONDITIONAL(BUILD_FTS_EXTTEXTCAT, test "$have_fts_exttextcat" = "yes")
 
-if test "$want_fts_normalizer" != "no"; then
+if test "$want_icu" != "no"; then
   if test "$PKG_CONFIG" != "" && $PKG_CONFIG --exists icu-i18n 2>/dev/null; then
-    PKG_CHECK_MODULES(FTS_NORMALIZER, icu-i18n)
-    have_fts_normalizer=yes
-    AC_DEFINE(HAVE_FTS_NORMALIZER,, Define if you want ICU normalization support for FTS)
-  elif test "$want_fts_normalizer" = "yes"; then
-    AC_ERROR([Can't build with normalizer support: libicu-i18n not found])
+    PKG_CHECK_MODULES(LIBICU, icu-i18n)
+    have_icu=yes
+    AC_DEFINE(HAVE_LIBICU,, Define if you want ICU normalization support for FTS)
+  elif test "$want_icu" = "yes"; then
+    AC_ERROR([Can't build with libicu support: libicu-i18n not found])
   fi
 fi
-AM_CONDITIONAL(BUILD_FTS_NORMALIZER, test "$have_fts_normalizer" = "yes")
+AM_CONDITIONAL(BUILD_LIBICU, test "$have_icu" = "yes")
 
 if test $have_lucene = no; then
   not_fts="$not_fts lucene"

diff --git a/src/lib-fts/Makefile.am b/src/lib-fts/Makefile.am
index 024c3a965c52cd9d994d4d530ff3028b709f1016..bb1023daeb3b78476356d700e65f65f40f72e032 100644 (file)
--- a/src/lib-fts/Makefile.am
+++ b/src/lib-fts/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-test \
        $(LIBEXTTEXTCAT_CFLAGS) \
-       $(FTS_NORMALIZER_CFLAGS) \
+       $(LIBICU_CFLAGS) \
        -DUDHRDIR=\""$(top_srcdir)/src/lib-fts"\" \
        -DDATADIR=\"$(pkgdatadir)\" \
        -DTEST_STOPWORDS_DIR=\""$(top_srcdir)/src/lib-fts"\"
@@ -49,8 +49,8 @@ TEXTCAT_LIBS = -ltextcat
 endif
 endif
 
-if BUILD_FTS_NORMALIZER
-NORMALIZER_LIBS = $(FTS_NORMALIZER_LIBS)
+if BUILD_LIBICU
+NORMALIZER_LIBS = $(LIBICU_LIBS)
 endif
 
 libfts_la_LIBADD = \
@@ -79,7 +79,6 @@ noinst_HEADERS = \
 test_programs = \
        test-fts-filter \
        $(TEST_FTS_LANGUAGE) \
-       $(TEST_FTS_NORMALIZER) \
        test-fts-tokenizer
 
 noinst_PROGRAMS = $(test_programs)

diff --git a/src/lib-fts/fts-filter-normalizer.c b/src/lib-fts/fts-filter-normalizer.c
index 1cbd6514f1934100410f87cc80a9db63976bf789..68c2cb04d96be551fad8d1263d70bd550fa853fc 100644 (file)
--- a/src/lib-fts/fts-filter-normalizer.c
+++ b/src/lib-fts/fts-filter-normalizer.c
@@ -6,7 +6,7 @@
 #include "fts-filter-private.h"
 #include "fts-language.h"
 
-#ifdef HAVE_FTS_NORMALIZER
+#ifdef HAVE_LIBICU
 
 #include <unicode/utrans.h>
 #include <unicode/uenum.h>