From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Mon, 21 Nov 2022 11:39:16 +0000 (+0000)
Subject: global: Drop berkley db support leftovers
X-Git-Tag: 2.4.0~3389
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=906f97354447c4fd0296443bbbf150e41512de96;p=thirdparty%2Fdovecot%2Fcore.git

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 d83e44d14c..b50754366d 100644
--- 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
index 914b4eeae6..0000000000
--- 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 06ab2f8dc6..3c08e06165 100644
--- 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 c9e256844f..ed9e287f10 100644
--- 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 3c37589e9b..bd72d51810 100644
--- 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 14b1cea64f..96716f7ed3 100644
--- 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;