configure: Fix building without LDAP

diff --git a/m4/want_ldap.m4 b/m4/want_ldap.m4
index 86f97e27a271200896d3fcbbfc2eab84d0b49cd3..432a53db4c12d166c0548dcd35dbc61e5e4187f1 100644 (file)
--- a/m4/want_ldap.m4
+++ b/m4/want_ldap.m4
@@ -57,5 +57,5 @@ AC_DEFUN([DOVECOT_WANT_LDAP], [
   ])
 
   AM_CONDITIONAL(LDAP_PLUGIN, test "$have_ldap_plugin" = "yes")
-  AM_CONDITIONAL(HAVE_LDAP, test "$want_ldap" != "no")
+  AM_CONDITIONAL(HAVE_LDAP, test "$have_ldap" != "no")
 ])

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 4c6c4575f95a3583a499e60d6afc19056707420d..15371743922f45e72117cce0f184a2780958f6ca 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -7,9 +7,11 @@ if GSSAPI_PLUGIN
 GSSAPI_LIB = libmech_gssapi.la
 endif
 
+if HAVE_LDAP
 if LDAP_PLUGIN
 LDAP_LIB = libauthdb_ldap.la
 endif
+endif
 
 LUA_LIB =
 AUTH_LUA_LIBS =
@@ -171,6 +173,7 @@ libmech_gssapi_la_CPPFLAGS = $(AM_CPPFLAGS) $(KRB5_CFLAGS) -DPLUGIN_BUILD
 libmech_gssapi_la_SOURCES = mech-gssapi.c
 endif
 
+if HAVE_LDAP
 if LDAP_PLUGIN
 libauthdb_ldap_la_LDFLAGS = -module -avoid-version -shared
 libauthdb_ldap_la_LIBADD = $(LIBDOVECOT_LDAP) $(LDAP_LIBS)
@@ -179,6 +182,7 @@ libauthdb_ldap_la_SOURCES = $(ldap_sources)
 else
 auth_libs += $(LIBDOVECOT_LDAP)
 endif
+endif
 
 if AUTH_LUA_PLUGIN
 libauthdb_lua_la_LDFLAGS = -module -avoid-version -shared