dovecot-config: Fixed setting LIBDOVECOT_LIBFTS[_DEPS]

diff --git a/configure.ac b/configure.ac
index 141b043939d71dcb830bc0c3964b28d5ba0b35db..4b874c00d73c0743de0aa08c793902e3162ab740 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2523,7 +2523,6 @@ if test "$want_shared_libs" = "yes"; then
   LIBDOVECOT_LOGIN='$(top_builddir)/src/login-common/libdovecot-login.la'
   LIBDOVECOT_COMPRESS='$(top_builddir)/src/lib-compression/libcompression.la'
   LIBDOVECOT_LDA='$(top_builddir)/src/lib-lda/libdovecot-lda.la'
-  LIBDOVECOT_LIBFTS='$(top_builddir)/src/lib-fts/libfts.la'
 else
   LIBDOVECOT_DEPS='$(top_builddir)/src/lib-master/libmaster.la $(top_builddir)/src/lib-settings/libsettings.la $(top_builddir)/src/lib-stats/libstats.la $(top_builddir)/src/lib-http/libhttp.la $(top_builddir)/src/lib-dict/libdict.la $(top_builddir)/src/lib-dns/libdns.la $(top_builddir)/src/lib-fs/libfs.la $(top_builddir)/src/lib-imap/libimap.la $(top_builddir)/src/lib-mail/libmail.la $(top_builddir)/src/lib-sasl/libsasl.la $(top_builddir)/src/lib-auth/libauth.la $(top_builddir)/src/lib-charset/libcharset.la $(top_builddir)/src/lib-ssl-iostream/libssl_iostream.la $(top_builddir)/src/lib-test/libtest.la $(top_builddir)/src/lib/liblib.la'
   LIBDOVECOT="$LIBDOVECOT_DEPS \$(LIBICONV) \$(MODULE_LIBS)"
@@ -2531,11 +2530,11 @@ else
   LIBDOVECOT_LOGIN='$(top_builddir)/src/login-common/liblogin.la'
   LIBDOVECOT_COMPRESS='$(top_builddir)/src/lib-compression/libcompression.la'
   LIBDOVECOT_LDA='$(top_builddir)/src/lib-lda/liblda.la'
-  LIBDOVECOT_LIBFTS_DEPS='$(top_builddir)/src/lib-fts/libfts.la'
 fi
 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_LIBFTS='$(top_builddir)/src/lib-fts/libfts.la'
 AC_SUBST(LIBDOVECOT)
 AC_SUBST(LIBDOVECOT_DEPS)
 AC_SUBST(LIBDOVECOT_STORAGE)

diff --git a/dovecot-config.in.in b/dovecot-config.in.in
index 338a5a4742e59f1e835e9b19b980ee4ffec763c0..3630207045f9d8ecd3adb3dea591bcedfb0dcaf7 100644 (file)
--- a/dovecot-config.in.in
+++ b/dovecot-config.in.in
@@ -20,7 +20,7 @@ LIBDOVECOT_COMPRESS_DEPS="@LIBDOVECOT_COMPRESS@"
 LIBDOVECOT_LDA_DEPS="@LIBDOVECOT_LDA@"
 LIBDOVECOT_STORAGE_DEPS="@LIBDOVECOT_STORAGE_DEPS@"
 LIBDOVECOT_DSYNC_DEPS="@LIBDOVECOT_DSYNC@"
-LIBDOVECOT_LIBFTS_DEPS="@LIBDOVECOT_LIBFTS_DEPS@"
+LIBDOVECOT_LIBFTS_DEPS="@LIBDOVECOT_LIBFTS@"
 
 LIBDOVECOT_INCLUDE="-I$(incdir) -I$(incdir)/src/lib -I$(incdir)/src/lib-dict -I$(incdir)/src/lib-dns -I$(incdir)/src/lib-http -I$(incdir)/src/lib-mail -I$(incdir)/src/lib-imap -I$(incdir)/src/lib-fs -I$(incdir)/src/lib-charset -I$(incdir)/src/lib-auth -I$(incdir)/src/lib-master -I$(incdir)/src/lib-ssl-iostream -I$(incdir)/src/lib-compression -I$(incdir)/src/lib-settings -I$(incdir)/src/lib-test -I$(incdir)/src/lib-sasl -I$(incdir)/src/lib-stats"
 LIBDOVECOT_LDA_INCLUDE="-I$(incdir)/src/lib-lda -I$(incdir)/src/lda"