dict-ldap: Avoid linking to a dovecot-ldap shared library

The dict-ldap itself is the plugin, which is dynamically loaded.
There's no need for dovecot-ldap shared library to be used. This
changes the lib-ldap linking behavior to same as lib-sql.

diff --git a/Makefile.am b/Makefile.am
index c3944d9ee9f8c343e519fba650c2a565fbeda6a4..1e21f84e5a64d7923b6bddaf02abf55b117967ff 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,6 +73,7 @@ install-exec-hook:
        -e "s|^\(LIBDOVECOT\)=.*$$|\1='-L$(pkglibdir) -ldovecot'|" \
        -e "s|^\(LIBDOVECOT_LOGIN\)=.*$$|\1='-ldovecot-login $(SSL_LIBS)'|" \
        -e "s|^\(LIBDOVECOT_SQL\)=.*$$|\1=-ldovecot-sql|" \
+       -e "s|^\(LIBDOVECOT_LDAP\)=.*$$|\1=-ldovecot-ldap|" \
        -e "s|^\(LIBDOVECOT_COMPRESS\)=.*$$|\1=-ldovecot-compression|" \
        -e "s|^\(LIBDOVECOT_DSYNC\)=.*$$|\1=-ldovecot-dsync|" \
        -e "s|^\(LIBDOVECOT_LDA\)=.*$$|\1=-ldovecot-lda|" \

diff --git a/configure.ac b/configure.ac
index 49c651d3410c711a91e63d3e1372a067848b4a3c..c7d26170acae00f8435051ccae8bb8e8ece29741 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -609,7 +609,7 @@ else
   fi
 fi
 if test $want_ldap != no; then
-  LIBDOVECOT_LDAP='$(top_builddir)/src/lib-ldap/libdovecot-ldap.la'
+  LIBDOVECOT_LDAP='$(top_builddir)/src/lib-ldap/libldap.la'
 else
   LIBDOVECOT_LDAP=''
 fi

diff --git a/src/lib-dict-backend/Makefile.am b/src/lib-dict-backend/Makefile.am
index cb50f0710ec0f8f7567bc28533d6d35f3ad59756..21841acc30bfce4bb4303da64124f4c2e6088317 100644 (file)
--- a/src/lib-dict-backend/Makefile.am
+++ b/src/lib-dict-backend/Makefile.am
@@ -46,7 +46,7 @@ libdict_ldap_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_BUILD
 libdict_ldap_la_SOURCES = $(ldap_sources)
 else
 if HAVE_LDAP
-libdict_backend_la_LIBADD += $(LIBDOVECOT_LDAP)
+libdict_backend_la_LIBADD += ../lib-ldap/libldap.la
 dict_drivers += ldap
 endif
 endif

diff --git a/src/lib-ldap/Makefile.am b/src/lib-ldap/Makefile.am
index d74bdbae09e63a45ab75c5c4bc2382a228d00eb9..065148b5b68524a2799cac9b4ef651917b289666 100644 (file)
--- a/src/lib-ldap/Makefile.am
+++ b/src/lib-ldap/Makefile.am
@@ -1,4 +1,4 @@
-pkglib_LTLIBRARIES = libdovecot-ldap.la
+noinst_LTLIBRARIES = libldap.la
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-ssl-iostream \
        $(LDAP_CFLAGS)
 
-libdovecot_ldap_la_SOURCES = \
+libldap_la_SOURCES = \
        ldap-client.c \
        ldap-connection.c \
        ldap-connection-pool.c \
@@ -17,9 +17,14 @@ libdovecot_ldap_la_SOURCES = \
        ldap-compare.c \
        ldap-entry.c
 
-libdovecot_ldap_la_DEPENDENCIES = $(LIBDOVECOT_DEPS)
+libldap_la_DEPENDENCIES = $(LIBDOVECOT_DEPS)
+libldap_la_LIBADD = $(LDAP_LIBS)
+
+pkglib_LTLIBRARIES = libdovecot-ldap.la
+libdovecot_ldap_la_SOURCES =
+libdovecot_ldap_la_LIBADD = libldap.la $(LIBDOVECOT)
+libdovecot_ldap_la_DEPENDENCIES = libldap.la $(LIBDOVECOT_DEPS)
 libdovecot_ldap_la_LDFLAGS = -export-dynamic
-libdovecot_ldap_la_LIBADD = $(LIBDOVECOT) $(LDAP_LIBS)
 
 headers = \
        ldap-client.h