lib-lda is now an installed shared library.

--HG--
branch : HEAD

diff --git a/Makefile.am b/Makefile.am
index 1c3265bf9fbe831847b3b0a9cf24021d36abdefc..b54bb6ea2e7ef2f7a8f5fcb08bfd1d364e04abc2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,6 +60,7 @@ install-exec-hook:
        -e "s|^\(LIBDOVECOT\)=.*$$|\1='-L$(pkglibdir) -ldovecot'|" \
        -e "s|^\(LIBDOVECOT_LOGIN\)=.*$$|\1=-ldovecot-login|" \
        -e "s|^\(LIBDOVECOT_SQL\)=.*$$|\1=-ldovecot-sql|" \
+       -e "s|^\(LIBDOVECOT_LDA\)=.*$$|\1=-ldovecot-lda|" \
        -e "s|^\(LIBDOVECOT_STORAGE\)=.*$$|\1=-ldovecot-storage|" \
        -e "s|^\(LIBDOVECOT_INCLUDE\)=.*$$|\1=-I$(pkgincludedir)|" \
        > $(DESTDIR)$(pkglibdir)/dovecot-config

diff --git a/configure.in b/configure.in
index 7bdb48dba697315053f670005f9fa9199703a66c..b734eb64313c70c816b992658611d0f779d0f567 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2455,11 +2455,13 @@ else
   LIBDOVECOT_LOGIN='$(top_builddir)/src/login-common/liblogin.la'
 fi
 LIBDOVECOT_SQL='$(top_builddir)/src/lib-sql/libsql.la'
+LIBDOVECOT_LDA='$(top_builddir)/src/lib-lda/liblda.la'
 AC_SUBST(LIBDOVECOT)
 AC_SUBST(LIBDOVECOT_DEPS)
 AC_SUBST(LIBDOVECOT_STORAGE)
 AC_SUBST(LIBDOVECOT_LOGIN)
 AC_SUBST(LIBDOVECOT_SQL)
+AC_SUBST(LIBDOVECOT_LDA)
 
 dnl **
 dnl ** SQL drivers

diff --git a/dovecot-config.in.in b/dovecot-config.in.in
index 9358bbbeb25780e759eb844804faee20ea887ec2..8d0545c1ce614def64b9c95e9a2054aa59aaed69 100644 (file)
--- a/dovecot-config.in.in
+++ b/dovecot-config.in.in
@@ -5,11 +5,13 @@ DOVECOT_SSL_LIBS="@SSL_LIBS@"
 LIBDOVECOT="@LIBDOVECOT@ @MODULE_LIBS@"
 LIBDOVECOT_LOGIN="@LIBDOVECOT_LOGIN@"
 LIBDOVECOT_SQL="@LIBDOVECOT_SQL@"
+LIBDOVECOT_LDA="@LIBDOVECOT_LDA@"
 LIBDOVECOT_STORAGE="@LIBDOVECOT_STORAGE@"
 
 LIBDOVECOT_DEPS="@LIBDOVECOT@"
 LIBDOVECOT_LOGIN_DEPS="@LIBDOVECOT_LOGIN@"
 LIBDOVECOT_SQL_DEPS="@LIBDOVECOT_SQL@"
+LIBDOVECOT_LDA_DEPS="@LIBDOVECOT_LDA@"
 LIBDOVECOT_STORAGE_DEPS="@LIBDOVECOT_STORAGE@"
 
 LIBDOVECOT_INCLUDE="-I$(incdir) -I$(incdir)/src/lib -I$(incdir)/src/lib-dict -I$(incdir)/src/lib-mail -I$(incdir)/src/lib-imap -I$(incdir)/src/lib-charset"

diff --git a/dovecot.m4 b/dovecot.m4
index d727bbdeeb586b5404c8878b1c6c1e2421baba1d..b277095dddba473c3cf5bd9d6723bff70205f4ac 100644 (file)
--- a/dovecot.m4
+++ b/dovecot.m4
@@ -54,8 +54,8 @@ AC_DEFUN([DC_DOVECOT],[
                "$dovecotdir"/dovecot-config`
        AX_SUBST_L([dovecot_moduledir], [dovecot_pkgincludedir], [dovecot_pkglibexecdir], [dovecot_pkglibdir], [dovecot_docdir])
        AX_SUBST_L([DOVECOT_CFLAGS], [DOVECOT_LIBS], [DOVECOT_SSL_LIBS])
-       AX_SUBST_L([LIBDOVECOT], [LIBDOVECOT_LOGIN], [LIBDOVECOT_SQL], [LIBDOVECOT_STORAGE])
-       AX_SUBST_L([LIBDOVECOT_DEPS], [LIBDOVECOT_LOGIN_DEPS], [LIBDOVECOT_SQL_DEPS], [LIBDOVECOT_STORAGE_DEPS])
+       AX_SUBST_L([LIBDOVECOT], [LIBDOVECOT_LOGIN], [LIBDOVECOT_SQL], [LIBDOVECOT_LDA], [LIBDOVECOT_STORAGE])
+       AX_SUBST_L([LIBDOVECOT_DEPS], [LIBDOVECOT_LOGIN_DEPS], [LIBDOVECOT_SQL_DEPS], [LIBDOVECOT_LDA_DEPS], [LIBDOVECOT_STORAGE_DEPS])
        AX_SUBST_L([LIBDOVECOT_INCLUDE], [LIBDOVECOT_LDA_INCLUDE], [LIBDOVECOT_SERVICE_INCLUDE], [LIBDOVECOT_STORAGE_INCLUDE], [LIBDOVECOT_LOGIN_INCLUDE])
 
        DC_PLUGIN_DEPS

diff --git a/src/lda/Makefile.am b/src/lda/Makefile.am
index 7a7594bc09f314527ab9199e75a069c67c71ab73..846372d726cc3b63ab91e261f8152198af50f475 100644 (file)
--- a/src/lda/Makefile.am
+++ b/src/lda/Makefile.am
@@ -24,13 +24,10 @@ unused_objects = \
        ../lib-storage/mail-search-parser-imap.o
 endif
 
-libs = \
-       ../lib-lda/liblda.a \
-       $(LIBDOVECOT_STORAGE) \
-       $(unused_objects)
+libs = $(unused_objects)
 
-dovecot_lda_LDADD = $(libs) $(LIBDOVECOT) $(MODULE_LIBS)
-dovecot_lda_DEPENDENCIES = $(libs) $(LIBDOVECOT_DEPS)
+dovecot_lda_LDADD = $(libs) $(LIBDOVECOT_STORAGE) $(LIBDOVECOT_LDA) $(LIBDOVECOT) $(MODULE_LIBS)
+dovecot_lda_DEPENDENCIES = $(libs) $(LIBDOVECOT_STORAGE_DEPS) $(LIBDOVECOT_LDA_DEPS) $(LIBDOVECOT_DEPS)
 
 dovecot_lda_SOURCES = \
        main.c

diff --git a/src/lib-lda/Makefile.am b/src/lib-lda/Makefile.am
index 4b5e8e8fe4c9c00f957142703d0f4b70f6dabc89..b146f273ee82326924d58ea3049c4f24306b4c5e 100644 (file)
--- a/src/lib-lda/Makefile.am
+++ b/src/lib-lda/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LIBRARIES = liblda.a
+noinst_LTLIBRARIES = liblda.la
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-mail \
        -I$(top_srcdir)/src/lib-storage
 
-liblda_a_SOURCES = \
+liblda_la_SOURCES = \
        duplicate.c \
        lda-settings.c \
        lmtp-client.c \
@@ -27,3 +27,9 @@ headers = \
 
 pkginc_libdir=$(pkgincludedir)
 pkginc_lib_HEADERS = $(headers)
+
+pkglib_LTLIBRARIES = libdovecot-lda.la
+libdovecot_lda_la_SOURCES = 
+libdovecot_lda_la_LIBADD = liblda.la
+libdovecot_lda_la_DEPENDENCIES = liblda.la
+libdovecot_lda_la_LDFLAGS = -export-dynamic

diff --git a/src/lmtp/Makefile.am b/src/lmtp/Makefile.am
index 305aea5ffdbc592134cdfad6fa44227ec7c27cff..2953f9e4fc7af16a92b07dbb17a799b060ffaafa 100644 (file)
--- a/src/lmtp/Makefile.am
+++ b/src/lmtp/Makefile.am
@@ -22,19 +22,14 @@ unused_objects = \
        ../lib/mountpoint.o \
        ../lib-mail/message-header-encode.o \
        ../lib-imap/imap-util.o \
-       ../lib-storage/mail-search-parser-imap.o
-endif
-lda_unused_objects = \
+       ../lib-storage/mail-search-parser-imap.o \
        ../lib-lda/smtp-client.o
+endif
 
-libs = \
-       ../lib-lda/liblda.a \
-       $(LIBDOVECOT_STORAGE) \
-       $(lda_unused_objects) \
-       $(unused_objects)
+libs = $(unused_objects)
 
-lmtp_LDADD = $(libs) $(LIBDOVECOT) $(MODULE_LIBS)
-lmtp_DEPENDENCIES = $(libs) $(LIBDOVECOT_DEPS)
+lmtp_LDADD = $(libs) $(LIBDOVECOT_STORAGE) $(LIBDOVECOT_LDA) $(LIBDOVECOT) $(MODULE_LIBS)
+lmtp_DEPENDENCIES = $(libs) $(LIBDOVECOT_STORAGE_DEPS) $(LIBDOVECOT_LDA_DEPS) $(LIBDOVECOT_DEPS)
 
 lmtp_SOURCES = \
        main.c \