dovecot-2.2: dict: cdb support should be available only to dict ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/16ff063e3588
changeset: 18337:16ff063e3588
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Mar 12 15:42:31 2015 +0200
description:
dict: cdb support should be available only to dict process.
Because otherwise we need to link libcdb into pretty much all Dovecot
binaries, which is part of what having the dict proxy tries to avoid.

We could implement the direct linking optionally as well, but that would
need to be done in a bit more generic way rather than just hardcoding it only
to cdb support.

diffstat:

 configure.ac             |  1 +
 src/lib-dict/Makefile.am |  2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diffs (30 lines):

diff -r 8780ca0fbf22 -r 16ff063e3588 configure.ac
--- a/configure.ac	Thu Mar 12 15:33:13 2015 +0200
+++ b/configure.ac	Thu Mar 12 15:42:31 2015 +0200
@@ -2129,6 +2129,7 @@
   AC_CHECK_LIB(cdb, cdb_init, [
     AC_CHECK_HEADER(cdb.h, [
       DICT_LIBS="$DICT_LIBS -lcdb"
+      dict_drivers="$dict_drivers cdb"
       AC_DEFINE(BUILD_CDB,, Build with CDB support)
     ], [
       if test $want_cdb = yes; then
diff -r 8780ca0fbf22 -r 16ff063e3588 src/lib-dict/Makefile.am
--- a/src/lib-dict/Makefile.am	Thu Mar 12 15:33:13 2015 +0200
+++ b/src/lib-dict/Makefile.am	Thu Mar 12 15:42:31 2015 +0200
@@ -15,7 +15,6 @@
 	dict.c \
 	dict-client.c \
 	dict-file.c \
-	dict-cdb.c \
 	dict-fs.c \
 	dict-memcached.c \
 	dict-memcached-ascii.c \
@@ -28,6 +27,7 @@
 
 libdict_backend_a_SOURCES = \
 	dict-db.c \
+	dict-cdb.c \
 	dict-sql.c \
 	dict-sql-settings.c