Mercurial > dovecot > core-2.2
changeset 11186:1319fa7a7266 HEAD
lib-lda is now an installed shared library.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Fri, 23 Apr 2010 10:37:45 +0300 |
parents | 62256701a326 |
children | 82d5351b5d39 |
files | Makefile.am configure.in dovecot-config.in.in dovecot.m4 src/lda/Makefile.am src/lib-lda/Makefile.am src/lmtp/Makefile.am |
diffstat | 7 files changed, 23 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Fri Apr 23 10:09:57 2010 +0300 +++ b/Makefile.am Fri Apr 23 10:37:45 2010 +0300 @@ -60,6 +60,7 @@ -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
--- a/configure.in Fri Apr 23 10:09:57 2010 +0300 +++ b/configure.in Fri Apr 23 10:37:45 2010 +0300 @@ -2455,11 +2455,13 @@ 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
--- a/dovecot-config.in.in Fri Apr 23 10:09:57 2010 +0300 +++ b/dovecot-config.in.in Fri Apr 23 10:37:45 2010 +0300 @@ -5,11 +5,13 @@ 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"
--- a/dovecot.m4 Fri Apr 23 10:09:57 2010 +0300 +++ b/dovecot.m4 Fri Apr 23 10:37:45 2010 +0300 @@ -54,8 +54,8 @@ "$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
--- a/src/lda/Makefile.am Fri Apr 23 10:09:57 2010 +0300 +++ b/src/lda/Makefile.am Fri Apr 23 10:37:45 2010 +0300 @@ -24,13 +24,10 @@ ../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
--- a/src/lib-lda/Makefile.am Fri Apr 23 10:09:57 2010 +0300 +++ b/src/lib-lda/Makefile.am Fri Apr 23 10:37:45 2010 +0300 @@ -1,4 +1,4 @@ -noinst_LIBRARIES = liblda.a +noinst_LTLIBRARIES = liblda.la AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ @@ -9,7 +9,7 @@ -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 @@ 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
--- a/src/lmtp/Makefile.am Fri Apr 23 10:09:57 2010 +0300 +++ b/src/lmtp/Makefile.am Fri Apr 23 10:37:45 2010 +0300 @@ -22,19 +22,14 @@ ../lib/mountpoint.o \ ../lib-mail/message-header-encode.o \ ../lib-imap/imap-util.o \ - ../lib-storage/mail-search-parser-imap.o + ../lib-storage/mail-search-parser-imap.o \ + ../lib-lda/smtp-client.o endif -lda_unused_objects = \ - ../lib-lda/smtp-client.o -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 \