Mercurial > dovecot > core-2.2
changeset 19997:ebf926e29527
configure: Add lib-ldap
| author | Aki Tuomi <aki.tuomi@dovecot.fi> |
|---|---|
| date | Mon, 11 Apr 2016 09:38:27 +0300 |
| parents | dbbcfdb60f1e |
| children | 00c0c0d7707b |
| files | configure.ac src/Makefile.am |
| diffstat | 2 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Mon Apr 11 09:37:39 2016 +0300 +++ b/configure.ac Mon Apr 11 09:38:27 2016 +0300 @@ -2044,7 +2044,7 @@ 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 @@ 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_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-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
--- a/src/Makefile.am Mon Apr 11 09:37:39 2016 +0300 +++ b/src/Makefile.am Mon Apr 11 09:38:27 2016 +0300 @@ -1,3 +1,7 @@ +if HAVE_LDAP +LIB_LDAP=lib-ldap +endif + LIBDOVECOT_SUBDIRS = \ lib-test \ lib \ @@ -6,6 +10,7 @@ lib-master \ lib-charset \ lib-dns \ + $(LIB_LDAP) \ lib-dict \ lib-sasl \ lib-ssl-iostream \