dovecot-2.2: Install libdovecot-dsync.so library, which can be u...
dovecot at dovecot.org
dovecot at dovecot.org
Mon Sep 15 15:04:34 UTC 2014
details: http://hg.dovecot.org/dovecot-2.2/rev/3675d156b309
changeset: 17801:3675d156b309
user: Timo Sirainen <tss at iki.fi>
date: Mon Sep 15 18:04:20 2014 +0300
description:
Install libdovecot-dsync.so library, which can be used separately.
diffstat:
Makefile.am | 1 +
configure.ac | 2 ++
dovecot-config.in.in | 3 +++
dovecot.m4 | 8 ++++----
src/doveadm/Makefile.am | 2 +-
src/doveadm/dsync/Makefile.am | 22 +++++++++++++++++-----
6 files changed, 28 insertions(+), 10 deletions(-)
diffs (151 lines):
diff -r eff79a80e0c9 -r 3675d156b309 Makefile.am
--- a/Makefile.am Mon Sep 15 18:02:02 2014 +0300
+++ b/Makefile.am Mon Sep 15 18:04:20 2014 +0300
@@ -68,6 +68,7 @@
-e "s|^\(LIBDOVECOT_LOGIN\)=.*$$|\1='-ldovecot-login $(SSL_LIBS)'|" \
-e "s|^\(LIBDOVECOT_SQL\)=.*$$|\1=-ldovecot-sql|" \
-e "s|^\(LIBDOVECOT_COMPRESS\)=.*$$|\1=-ldovecot-compression|" \
+ -e "s|^\(LIBDOVECOT_DSYNC\)=.*$$|\1=-ldovecot-dsync|" \
-e "s|^\(LIBDOVECOT_LDA\)=.*$$|\1=-ldovecot-lda|" \
-e "s|^\(LIBDOVECOT_STORAGE\)=.*$$|\1='-ldovecot-storage $(LINKED_STORAGE_LDADD)'|" \
-e "s|^\(LIBDOVECOT_INCLUDE\)=.*$$|\1=-I$(pkgincludedir)|" \
diff -r eff79a80e0c9 -r 3675d156b309 configure.ac
--- a/configure.ac Mon Sep 15 18:02:02 2014 +0300
+++ b/configure.ac Mon Sep 15 18:04:20 2014 +0300
@@ -2559,6 +2559,7 @@
LIBDOVECOT_LDA='$(top_builddir)/src/lib-lda/liblda.la'
fi
LIBDOVECOT_STORAGE="$LIBDOVECOT_STORAGE_DEPS $LINKED_STORAGE_LDADD"
+LIBDOVECOT_DSYNC='$(top_builddir)/src/doveadm/dsync/libdovecot-dsync.la'
LIBDOVECOT_SQL='$(top_builddir)/src/lib-sql/libsql.la'
AC_SUBST(LIBDOVECOT)
AC_SUBST(LIBDOVECOT_DEPS)
@@ -2567,6 +2568,7 @@
AC_SUBST(LIBDOVECOT_LOGIN)
AC_SUBST(LIBDOVECOT_SQL)
AC_SUBST(LIBDOVECOT_COMPRESS)
+AC_SUBST(LIBDOVECOT_DSYNC)
AC_SUBST(LIBDOVECOT_LDA)
dnl **
diff -r eff79a80e0c9 -r 3675d156b309 dovecot-config.in.in
--- a/dovecot-config.in.in Mon Sep 15 18:02:02 2014 +0300
+++ b/dovecot-config.in.in Mon Sep 15 18:04:20 2014 +0300
@@ -10,6 +10,7 @@
LIBDOVECOT_COMPRESS="@LIBDOVECOT_COMPRESS@"
LIBDOVECOT_LDA="@LIBDOVECOT_LDA@"
LIBDOVECOT_STORAGE="@LIBDOVECOT_STORAGE@"
+LIBDOVECOT_DSYNC="@LIBDOVECOT_DSYNC@"
LIBDOVECOT_DEPS="@LIBDOVECOT_DEPS@"
LIBDOVECOT_LOGIN_DEPS="@LIBDOVECOT_LOGIN@"
@@ -17,11 +18,13 @@
LIBDOVECOT_COMPRESS_DEPS="@LIBDOVECOT_COMPRESS@"
LIBDOVECOT_LDA_DEPS="@LIBDOVECOT_LDA@"
LIBDOVECOT_STORAGE_DEPS="@LIBDOVECOT_STORAGE_DEPS@"
+LIBDOVECOT_DSYNC_DEPS="@LIBDOVECOT_DSYNC@"
LIBDOVECOT_INCLUDE="-I$(incdir) -I$(incdir)/src/lib -I$(incdir)/src/lib-dict -I$(incdir)/src/lib-dns -I$(incdir)/src/lib-http -I$(incdir)/src/lib-mail -I$(incdir)/src/lib-imap -I$(incdir)/src/lib-fs -I$(incdir)/src/lib-charset -I$(incdir)/src/lib-auth -I$(incdir)/src/lib-master -I$(incdir)/src/lib-ssl-iostream -I$(incdir)/src/lib-compression -I$(incdir)/src/lib-settings -I$(incdir)/src/lib-test"
LIBDOVECOT_LDA_INCLUDE="-I$(incdir)/src/lib-lda -I$(incdir)/src/lda"
LIBDOVECOT_DOVEADM_INCLUDE="-I$(incdir)/src/doveadm"
LIBDOVECOT_STORAGE_INCLUDE="-I$(incdir)/src/lib-index -I$(incdir)/src/lib-storage -I$(incdir)/src/lib-storage/list -I$(incdir)/src/lib-storage/index -I$(incdir)/src/lib-storage/index/raw -I$(incdir)/src/plugins/quota"
+LIBDOVECOT_DSYNC_INCLUDE="-I$(incdir)/src/doveadm/dsync"
LIBDOVECOT_LOGIN_INCLUDE="-I$(incdir)/src/login-common"
LIBDOVECOT_IMAP_INCLUDE="-I$(incdir)/src/imap"
LIBDOVECOT_CONFIG_INCLUDE="-I$(incdir)/src/config"
diff -r eff79a80e0c9 -r 3675d156b309 dovecot.m4
--- a/dovecot.m4 Mon Sep 15 18:02:02 2014 +0300
+++ b/dovecot.m4 Mon Sep 15 18:04:20 2014 +0300
@@ -6,7 +6,7 @@
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# serial 12
+# serial 13
AC_DEFUN([DC_DOVECOT_MODULEDIR],[
AC_ARG_WITH(moduledir,
@@ -87,9 +87,9 @@
AX_SUBST_L([DISTCHECK_CONFIGURE_FLAGS], [dovecotdir], [dovecot_moduledir], [dovecot_pkgincludedir], [dovecot_pkglibexecdir], [dovecot_pkglibdir], [dovecot_docdir])
AX_SUBST_L([DOVECOT_CFLAGS], [DOVECOT_LIBS], [DOVECOT_SSL_LIBS], [DOVECOT_SQL_LIBS], [DOVECOT_COMPRESS_LIBS])
- AX_SUBST_L([LIBDOVECOT], [LIBDOVECOT_LOGIN], [LIBDOVECOT_SQL], [LIBDOVECOT_SSL], [LIBDOVECOT_COMPRESS], [LIBDOVECOT_LDA], [LIBDOVECOT_STORAGE])
- AX_SUBST_L([LIBDOVECOT_DEPS], [LIBDOVECOT_LOGIN_DEPS], [LIBDOVECOT_SQL_DEPS], [LIBDOVECOT_SSL_DEPS], [LIBDOVECOT_COMPRESS_DEPS], [LIBDOVECOT_LDA_DEPS], [LIBDOVECOT_STORAGE_DEPS])
- AX_SUBST_L([LIBDOVECOT_INCLUDE], [LIBDOVECOT_LDA_INCLUDE], [LIBDOVECOT_DOVEADM_INCLUDE], [LIBDOVECOT_SERVICE_INCLUDE], [LIBDOVECOT_STORAGE_INCLUDE], [LIBDOVECOT_LOGIN_INCLUDE], [LIBDOVECOT_CONFIG_INCLUDE], [LIBDOVECOT_IMAP_INCLUDE])
+ AX_SUBST_L([LIBDOVECOT], [LIBDOVECOT_LOGIN], [LIBDOVECOT_SQL], [LIBDOVECOT_SSL], [LIBDOVECOT_COMPRESS], [LIBDOVECOT_LDA], [LIBDOVECOT_STORAGE], [LIBDOVECOT_DSYNC])
+ AX_SUBST_L([LIBDOVECOT_DEPS], [LIBDOVECOT_LOGIN_DEPS], [LIBDOVECOT_SQL_DEPS], [LIBDOVECOT_SSL_DEPS], [LIBDOVECOT_COMPRESS_DEPS], [LIBDOVECOT_LDA_DEPS], [LIBDOVECOT_STORAGE_DEPS], [LIBDOVECOT_DSYNC_DEPS])
+ AX_SUBST_L([LIBDOVECOT_INCLUDE], [LIBDOVECOT_LDA_INCLUDE], [LIBDOVECOT_DOVEADM_INCLUDE], [LIBDOVECOT_SERVICE_INCLUDE], [LIBDOVECOT_STORAGE_INCLUDE], [LIBDOVECOT_LOGIN_INCLUDE], [LIBDOVECOT_CONFIG_INCLUDE], [LIBDOVECOT_IMAP_INCLUDE], [LIBDOVECOT_DSYNC_INCLUDE])
DC_PLUGIN_DEPS
])
diff -r eff79a80e0c9 -r 3675d156b309 src/doveadm/Makefile.am
--- a/src/doveadm/Makefile.am Mon Sep 15 18:02:02 2014 +0300
+++ b/src/doveadm/Makefile.am Mon Sep 15 18:04:20 2014 +0300
@@ -34,7 +34,7 @@
../lib-otp/libotp.a
libs = \
- dsync/libdsync.la \
+ dsync/libdoveadm_dsync.la \
../lib-compression/libcompression.la
doveadm_LDADD = \
diff -r eff79a80e0c9 -r 3675d156b309 src/doveadm/dsync/Makefile.am
--- a/src/doveadm/dsync/Makefile.am Mon Sep 15 18:02:02 2014 +0300
+++ b/src/doveadm/dsync/Makefile.am Mon Sep 15 18:04:20 2014 +0300
@@ -1,4 +1,5 @@
-noinst_LTLIBRARIES = libdsync.la
+pkglib_LTLIBRARIES = libdovecot-dsync.la
+noinst_LTLIBRARIES = libdsync.la libdoveadm_dsync.la
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib \
@@ -13,7 +14,6 @@
-I$(top_srcdir)/src/doveadm
libdsync_la_SOURCES = \
- doveadm-dsync.c \
dsync-brain.c \
dsync-brain-mailbox.c \
dsync-brain-mailbox-tree.c \
@@ -34,9 +34,22 @@
dsync-ibc-pipe.c \
dsync-transaction-log-scan.c
+libdoveadm_dsync_la_SOURCES = doveadm-dsync.c
+libdoveadm_dsync_la_LIBADD = libdsync.la
+libdoveadm_dsync_la_DEPENDENCIES = libdsync.la
+
+libdovecot_dsync_la_SOURCES =
+libdovecot_dsync_la_LIBADD = libdsync.la
+libdovecot_dsync_la_DEPENDENCIES = libdsync.la
+libdovecot_dsync_la_LDFLAGS = -export-dynamic
+
+pkginc_libdir = $(pkgincludedir)
+pkginc_lib_HEADERS = \
+ dsync-brain.h \
+ dsync-ibc.h
+
noinst_HEADERS = \
doveadm-dsync.h \
- dsync-brain.h \
dsync-brain-private.h \
dsync-mail.h \
dsync-mailbox.h \
@@ -47,7 +60,6 @@
dsync-mailbox-tree-private.h \
dsync-serializer.h \
dsync-deserializer.h \
- dsync-ibc.h \
dsync-ibc-private.h \
dsync-transaction-log-scan.h
@@ -62,7 +74,7 @@
test_dsync_mailbox_tree_sync_SOURCES = test-dsync-mailbox-tree-sync.c
test_dsync_mailbox_tree_sync_LDADD = dsync-mailbox-tree-sync.lo dsync-mailbox-tree.lo $(test_libs)
-test_dsync_mailbox_tree_sync_DEPENDENCIES = $(noinst_LTLIBRARIES) $(test_libs)
+test_dsync_mailbox_tree_sync_DEPENDENCIES = $(pkglib_LTLIBRARIES) $(test_libs)
check: check-am check-test
check-test: all-am
More information about the dovecot-cvs
mailing list