global: Drop berkley db support leftovers

Berkeley DB support was already removed in d5acb577,
but these changes had been left behind at that time.

diff --git a/configure.ac b/configure.ac
index d83e44d14cb752e37875568f4bfa6b3bd7a828a3..b50754366df641c4abeb2d6121745390c92d4012 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -95,13 +95,6 @@ AS_HELP_STRING([--with-libunwind], [Build with libunwind support (auto)]),
   TEST_WITH(libunwind, $withval),
   want_libunwind=auto)
 
-# Berkeley DB support is more or less broken. Disabled for now.
-#AC_ARG_WITH(db,
-#AS_HELP_STRING([--with-db], [Build with Berkeley DB support]),
-#  TEST_WITH(db, $withval),
-#  want_db=no)
-want_db=no
-
 AC_ARG_WITH(cdb,
 AS_HELP_STRING([--with-cdb], [Build with CDB support]),
   TEST_WITH(cdb, $withval),
@@ -480,7 +473,6 @@ DOVECOT_WANT_PAM
 DOVECOT_WANT_BSDAUTH
 DOVECOT_WANT_GSSAPI
 DOVECOT_WANT_LDAP
-DOVECOT_WANT_DB
 DOVECOT_WANT_CDB
 DOVECOT_WANT_PGSQL
 DOVECOT_WANT_MYSQL

diff --git a/m4/want_db.m4 b/m4/want_db.m4
deleted file mode 100644 (file)
index 914b4ee..0000000
--- a/m4/want_db.m4
+++ /dev/null
@@ -1,33 +0,0 @@
-AC_DEFUN([DOVECOT_WANT_DB], [
-  AS_IF([test $want_db != no], [
-    AC_CACHE_CHECK([db_env_create in -ldb],i_cv_have_db_env_create,[
-      old_LIBS=$LIBS
-      LIBS="$LIBS -ldb"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-        #include <db.h>
-      ]], [[
-        db_env_create(0, 0);
-      ]])],[
-        i_cv_have_db_env_create=yes
-      ], [
-        i_cv_have_db_env_create=no
-      ])
-      LIBS=$old_LIBS
-    ])
-    AS_IF([test $i_cv_have_db_env_create = yes], [
-      AC_CHECK_HEADER(db.h, [
-        DICT_LIBS="$DICT_LIBS -ldb"
-        dict_drivers="$dict_drivers db"
-        AC_DEFINE(BUILD_DB,, [Build with Berkeley DB support])
-      ], [
-        AS_IF([test $want_db = yes], [
-          AC_MSG_ERROR(cannot build with db support: db.h not found)
-        ])
-      ])
-    ], [
-      AS_IF([test $want_db = yes], [
-        AC_MSG_ERROR(cannot build with db support: libdb not found)
-      ])
-    ])
-  ])
-])

diff --git a/src/dict/dict-expire.c b/src/dict/dict-expire.c
index 06ab2f8dc611a397821b8a243f6145f2a5cf994b..3c08e0616562af144750b34863bba5484f83e48e 100644 (file)
--- a/src/dict/dict-expire.c
+++ b/src/dict/dict-expire.c
@@ -110,11 +110,6 @@ static void main_init(void)
        sets = master_service_settings_get_others(master_service);
        dict_settings = sets[0];
 
-       if (*dict_settings->dict_db_config != '\0') {
-               /* for berkeley db library */
-               env_put("DB_CONFIG", dict_settings->dict_db_config);
-       }
-
        i_zero(&mod_set);
        mod_set.abi_version = DOVECOT_ABI_VERSION;
        mod_set.require_init_funcs = TRUE;

diff --git a/src/dict/dict-settings.c b/src/dict/dict-settings.c
index c9e256844f5d1005afdd67fcbd4efdcf3f684e2d..ed9e287f10999bea698b7b14d0f6334237d6413f 100644 (file)
--- a/src/dict/dict-settings.c
+++ b/src/dict/dict-settings.c
@@ -112,8 +112,6 @@ struct service_settings dict_expire_service_settings = {
 static const struct setting_define dict_setting_defines[] = {
        DEF(STR, base_dir),
        DEF(BOOL, verbose_proctitle),
-
-       DEF(STR, dict_db_config),
        { .type = SET_STRLIST, .key = "dict",
          .offset = offsetof(struct dict_server_settings, dicts) },
 
@@ -123,8 +121,6 @@ static const struct setting_define dict_setting_defines[] = {
 const struct dict_server_settings dict_default_settings = {
        .base_dir = PKG_RUNDIR,
        .verbose_proctitle = FALSE,
-
-       .dict_db_config = "",
        .dicts = ARRAY_INIT
 };
 

diff --git a/src/dict/dict-settings.h b/src/dict/dict-settings.h
index 3c37589e9bedd6eb704f660003e5d8c731824339..bd72d518104cdbb6d3ceb04efe17142d0febd068 100644 (file)
--- a/src/dict/dict-settings.h
+++ b/src/dict/dict-settings.h
@@ -4,8 +4,6 @@
 struct dict_server_settings {
        const char *base_dir;
        bool verbose_proctitle;
-
-       const char *dict_db_config;
        ARRAY(const char *) dicts;
 };
 

diff --git a/src/dict/main.c b/src/dict/main.c
index 14b1cea64fe9d2f0ff6b48a80ac80d69aa564149..96716f7ed325485357dcd58c1dc6a099653e94c3 100644 (file)
--- a/src/dict/main.c
+++ b/src/dict/main.c
@@ -106,11 +106,6 @@ static void main_init(void)
        sets = master_service_settings_get_others(master_service);
        dict_settings = sets[0];
 
-       if (*dict_settings->dict_db_config != '\0') {
-               /* for berkeley db library */
-               env_put("DB_CONFIG", dict_settings->dict_db_config);
-       }
-
        i_zero(&mod_set);
        mod_set.abi_version = DOVECOT_ABI_VERSION;
        mod_set.require_init_funcs = TRUE;