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 947cb23e647512e26ee0443067431cffca016f5e..86f97e27a271200896d3fcbbfc2eab84d0b49cd3 100644 (file)
--- 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 a71da1045507e9d4a748d55de1323c43bb66f5bd..1a21602599c5007bb9ff649a8e302a8368f06d83 100644 (file)
--- 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 6afa4ab51074e4170ed04755892a6b8d8c8d951b..b13bc3beda0089daef2becd4753cb633f838548c 100644 (file)
--- 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 c1e108d00d14222897bdc0b2b2dcf5172e65f6e6..7e1795e9ab8b41da100c0dbb1ea98be70a6bc98f 100644 (file)
--- 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)"