configure: Add lib-ldap

diff --git a/configure.ac b/configure.ac
index 3f8cda325aa0c51450b1ec3a3a36732def946eaa..8d7445fefe1c39afacaf80335402a9c2089983f1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2044,7 +2044,7 @@ else
   fi
 fi
 AM_CONDITIONAL(LDAP_PLUGIN, test "$have_ldap_plugin" = "yes")
-
+AM_CONDITIONAL(HAVE_LDAP, test "$want_ldap" = "yes")
 dict_drivers=
 
 if test $want_db != no; then
@@ -2529,6 +2529,11 @@ else
   LIBDOVECOT_LOGIN='$(top_builddir)/src/login-common/liblogin.la'
   LIBDOVECOT_LDA='$(top_builddir)/src/lib-lda/liblda.la'
 fi
+if test $want_ldap = yes; then
+  LIBDOVECOT_LDAP='$(top_builddir)/src/lib-ldap/libdovecot-ldap.la'
+else
+  LIBDOVECOT_LDAP=''
+fi
 LIBDOVECOT_STORAGE="$LIBDOVECOT_STORAGE_DEPS"
 LIBDOVECOT_DSYNC='$(top_builddir)/src/doveadm/dsync/libdovecot-dsync.la'
 LIBDOVECOT_SQL='$(top_builddir)/src/lib-sql/libsql.la'
@@ -2543,6 +2548,7 @@ AC_SUBST(LIBDOVECOT_SQL)
 AC_SUBST(LIBDOVECOT_COMPRESS)
 AC_SUBST(LIBDOVECOT_DSYNC)
 AC_SUBST(LIBDOVECOT_LDA)
+AC_SUBST(LIBDOVECOT_LDAP)
 AC_SUBST(LIBDOVECOT_LIBFTS)
 AC_SUBST(LIBDOVECOT_LIBFTS_DEPS)
 
@@ -2863,6 +2869,7 @@ src/lib-imap-client/Makefile
 src/lib-imap-urlauth/Makefile
 src/lib-index/Makefile
 src/lib-lda/Makefile
+src/lib-ldap/Makefile
 src/lib-mail/Makefile
 src/lib-master/Makefile
 src/lib-ntlm/Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
index 2d57cdfa4e1bfa2f27eaaf3dc2ad47f5ca2977fd..cafcef86df19b52beccbc59b24f8fc09d8c4449e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,7 @@
+if HAVE_LDAP
+LIB_LDAP=lib-ldap
+endif
+
 LIBDOVECOT_SUBDIRS = \
        lib-test \
        lib \
@@ -6,6 +10,7 @@ LIBDOVECOT_SUBDIRS = \
        lib-master \
        lib-charset \
        lib-dns \
+       $(LIB_LDAP) \
        lib-dict \
        lib-sasl \
        lib-ssl-iostream \