From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Sun, 16 Feb 2025 07:19:18 +0000 (+0200)
Subject: global: Replace PASSDB_LDAP/USERDB_LDAP with HAVE_LDAP macro
X-Git-Tag: 2.4.1~197
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08101cef56524cd7e6321292f1acd704d80f3bdb;p=thirdparty%2Fdovecot%2Fcore.git

global: Replace PASSDB_LDAP/USERDB_LDAP with HAVE_LDAP macro

This macro is needed for other ldap-related code.
---

diff --git a/m4/want_ldap.m4 b/m4/want_ldap.m4
index 947cb23e64..86f97e27a2 100644
--- a/m4/want_ldap.m4
+++ b/m4/want_ldap.m4
@@ -49,8 +49,7 @@ AC_DEFUN([DOVECOT_WANT_LDAP], [
       ])
     ], $LDAP_LIBS)
 
-    AC_DEFINE(USERDB_LDAP,, [Build with LDAP support])
-    AC_DEFINE(PASSDB_LDAP,, [Build with LDAP support])
+    AC_DEFINE(HAVE_LDAP,, [Build with LDAP support])
     AC_CHECK_HEADERS(sasl.h sasl/sasl.h)
   ], [
     not_passdb="$not_passdb ldap"
diff --git a/src/auth/passdb-ldap.c b/src/auth/passdb-ldap.c
index a71da10455..1a21602599 100644
--- a/src/auth/passdb-ldap.c
+++ b/src/auth/passdb-ldap.c
@@ -3,7 +3,7 @@
 #include "auth-common.h"
 #include "passdb.h"
 
-#if defined(PASSDB_LDAP) && (defined(BUILTIN_LDAP) || defined(PLUGIN_BUILD))
+#if defined(HAVE_LDAP) && (defined(BUILTIN_LDAP) || defined(PLUGIN_BUILD))
 
 #include "ioloop.h"
 #include "array.h"
diff --git a/src/auth/userdb-ldap.c b/src/auth/userdb-ldap.c
index 6afa4ab510..b13bc3beda 100644
--- a/src/auth/userdb-ldap.c
+++ b/src/auth/userdb-ldap.c
@@ -3,7 +3,7 @@
 #include "auth-common.h"
 #include "userdb.h"
 
-#if defined(USERDB_LDAP) && (defined(BUILTIN_LDAP) || defined(PLUGIN_BUILD))
+#if defined(HAVE_LDAP) && (defined(BUILTIN_LDAP) || defined(PLUGIN_BUILD))
 
 #include "ioloop.h"
 #include "array.h"
diff --git a/src/master/main.c b/src/master/main.c
index c1e108d00d..7e1795e9ab 100644
--- a/src/master/main.c
+++ b/src/master/main.c
@@ -747,7 +747,7 @@ static void print_build_options(void)
 #ifdef PASSDB_BSDAUTH
 		" bsdauth"
 #endif
-#ifdef PASSDB_LDAP
+#ifdef HAVE_LDAP
 		" ldap"
 #endif
 #ifdef PASSDB_PAM
@@ -763,7 +763,7 @@ static void print_build_options(void)
 		" sql"
 #endif
 	"\nUserdb:"
-#ifdef USERDB_LDAP
+#ifdef HAVE_LDAP
 		" ldap"
 #ifndef BUILTIN_LDAP
 		"(plugin)"