lib-language: Replace libfts with liblanguage for linking

diff --git a/Makefile.am b/Makefile.am
index 1e21f84e5a64d7923b6bddaf02abf55b117967ff..536f23fb797dc304a8c55b8f25e36d9f12f64a9f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,7 +77,7 @@ install-exec-hook:
        -e "s|^\(LIBDOVECOT_COMPRESS\)=.*$$|\1=-ldovecot-compression|" \
        -e "s|^\(LIBDOVECOT_DSYNC\)=.*$$|\1=-ldovecot-dsync|" \
        -e "s|^\(LIBDOVECOT_LDA\)=.*$$|\1=-ldovecot-lda|" \
-       -e "s|^\(LIBDOVECOT_LIBFTS\)=.*$$|\1=-ldovecot-fts|" \
+       -e "s|^\(LIBDOVECOT_LIBLANG\)=.*$$|\1=-ldovecot-language|" \
        -e "s|^\(LIBDOVECOT_LUA\)=.*$$|\1=-ldovecot-lua|" \
        -e "s|^\(LIBDOVECOT_STORAGE\)=.*$$|\1='-ldovecot-storage $(LINKED_STORAGE_LDADD)'|" \
        -e "s|^\(LIBDOVECOT_OPENSSL\)=.*$$|\1=-lssl_iostream_openssl|" \

diff --git a/configure.ac b/configure.ac
index 1a0755a8c64a3998fc5708291a532acf0339ff7c..cf8fffd25f75f63e298ff7df1125ea20787744f6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -610,7 +610,7 @@ LIBDOVECOT_STORAGE="$LIBDOVECOT_STORAGE_DEPS"
 LIBDOVECOT_DSYNC='$(top_builddir)/src/doveadm/dsync/libdovecot-dsync.la'
 LIBDOVECOT_SQL='$(top_builddir)/src/lib-sql/libsql.la'
 LIBDOVECOT_COMPRESS='$(top_builddir)/src/lib-compression/libcompression.la'
-LIBDOVECOT_LIBFTS='$(top_builddir)/src/lib-language/libfts.la'
+LIBDOVECOT_LIBFTS='$(top_builddir)/src/lib-language/libdovecot-language.la'
 
 LIBDOVECOT_OPENSSL='$(top_builddir)/src/lib-ssl-iostream/libssl_iostream_openssl.la'
 LIBDOVECOT_OPENSSL_DEPS="$LIBDOVECOT_OPENSSL"

diff --git a/src/lib-language/Makefile.am b/src/lib-language/Makefile.am
index fbe1c1bf9715be3446830d5112d02458b2242b6e..2f23d22090012c73b1a6486efbc6b0f8f4048c5b 100644 (file)
--- a/src/lib-language/Makefile.am
+++ b/src/lib-language/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libfts.la
+noinst_LTLIBRARIES = liblanguage.la
 
 # I$(top_srcdir)/src/lib-language needed to include
 # word-break-data.c and word-boundary-data.c
@@ -72,12 +72,12 @@ NORMALIZER_LIBS = $(LIBICU_LIBS)
 ICU_TESTS = test-fts-icu
 endif
 
-libfts_la_LIBADD = \
+liblanguage_la_LIBADD = \
        $(STEMMER_LIBS) \
        $(TEXTCAT_LIBS) \
        $(NORMALIZER_LIBS)
 
-libfts_la_SOURCES = \
+liblanguage_la_SOURCES = \
        fts-filter.c \
        fts-filter-contractions.c \
        fts-filter-common.c \
@@ -111,11 +111,11 @@ headers = \
 pkginc_libdir=$(pkgincludedir)
 pkginc_lib_HEADERS = $(headers)
 
-pkglib_LTLIBRARIES = libdovecot-fts.la
-libdovecot_fts_la_SOURCES =
-libdovecot_fts_la_LIBADD = libfts.la $(LIBDOVECOT)
-libdovecot_fts_la_DEPENDENCIES = libfts.la $(LIBDOVECOT_DEPS)
-libdovecot_fts_la_LDFLAGS = -export-dynamic
+pkglib_LTLIBRARIES = libdovecot-language.la
+libdovecot_language_la_SOURCES =
+libdovecot_language_la_LIBADD = liblanguage.la $(LIBDOVECOT)
+libdovecot_language_la_DEPENDENCIES = liblanguage.la $(LIBDOVECOT_DEPS)
+libdovecot_language_la_LDFLAGS = -export-dynamic
 
 test_programs = \
        $(ICU_TESTS) \
@@ -135,8 +135,8 @@ test_fts_icu_LDADD = fts-icu.lo $(LIBICU_LIBS) $(test_libs)
 test_fts_icu_DEPENDENCIES = fts-icu.lo $(test_deps)
 
 test_fts_filter_SOURCES = test-fts-filter.c
-test_fts_filter_LDADD = libfts.la $(test_libs)
-test_fts_filter_DEPENDENCIES = libfts.la $(test_deps)
+test_fts_filter_LDADD = liblanguage.la $(test_libs)
+test_fts_filter_DEPENDENCIES = liblanguage.la $(test_deps)
 
 if BUILD_FTS_EXTTEXTCAT
 TEST_FTS_LANGUAGE = test-fts-language

diff --git a/src/plugins/fts/Makefile.am b/src/plugins/fts/Makefile.am
index 2d25d92c95fee57eb5a50dc152159aff9d8eab4c..b2a02c093131d6a33205586cf8c4810c0c7e3f6c 100644 (file)
--- a/src/plugins/fts/Makefile.am
+++ b/src/plugins/fts/Makefile.am
@@ -22,7 +22,7 @@ lib20_fts_plugin_la_LDFLAGS = -module -avoid-version
 module_LTLIBRARIES = \
        lib20_fts_plugin.la
 
-lib20_fts_plugin_la_LIBADD = ../../lib-language/libfts.la
+lib20_fts_plugin_la_LIBADD = ../../lib-language/liblanguage.la
 
 lib20_fts_plugin_la_SOURCES = \
        fts-api.c \