dovecot-2.2: Makefile: Link with SSL_LIBS whenever linking libss...
dovecot at dovecot.org
dovecot at dovecot.org
Sun May 20 03:26:25 EEST 2012
details: http://hg.dovecot.org/dovecot-2.2/rev/e540404debb7
changeset: 14285:e540404debb7
user: Timo Sirainen <tss at iki.fi>
date: Sun Mar 04 15:30:31 2012 +0200
description:
Makefile: Link with SSL_LIBS whenever linking libssl_iostream.la
diffstat:
configure.in | 9 +++++++--
dovecot-config.in.in | 2 +-
src/auth/Makefile.am | 2 +-
src/doveadm/Makefile.am | 5 ++++-
src/doveadm/dsync/Makefile.am | 3 ---
src/imap/Makefile.am | 13 ++++++++-----
src/indexer/Makefile.am | 13 ++++++++-----
src/lda/Makefile.am | 12 +++++++++---
src/lib-storage/Makefile.am | 1 +
src/lib-storage/index/Makefile.am | 3 ---
src/login-common/Makefile.am | 2 +-
src/plugins/fts-squat/Makefile.am | 12 +++++++-----
src/pop3/Makefile.am | 13 ++++++++-----
src/util/Makefile.am | 9 +++++++--
14 files changed, 62 insertions(+), 37 deletions(-)
diffs (285 lines):
diff -r a743cc250208 -r e540404debb7 configure.in
--- a/configure.in Sun Mar 04 15:21:21 2012 +0200
+++ b/configure.in Sun Mar 04 15:30:31 2012 +0200
@@ -2488,10 +2488,13 @@
want_ssl_libs=yes
fi
done
+LINKED_STORAGE_LDADD=
if test "$want_ssl_libs" = yes; then
LINKED_STORAGE_LIBS="$LINKED_STORAGE_LIBS \$(top_builddir)/src/lib-ssl-iostream/libssl_iostream.la"
+ LINKED_STORAGE_LDADD="$SSL_LIBS"
fi
AC_SUBST(LINKED_STORAGE_LIBS)
+AC_SUBST(LINKED_STORAGE_LDADD)
AC_SUBST(mailbox_list_drivers)
AC_DEFINE_UNQUOTED(MAIL_STORAGES, "$mail_storages", List of compiled in mail storages)
@@ -2507,7 +2510,7 @@
if test "$want_shared_libs" = "yes"; then
LIBDOVECOT_DEPS='$(top_builddir)/src/lib-dovecot/libdovecot.la'
LIBDOVECOT="$LIBDOVECOT_DEPS"
- LIBDOVECOT_STORAGE='$(top_builddir)/src/lib-storage/libdovecot-storage.la'
+ LIBDOVECOT_STORAGE_DEPS='$(top_builddir)/src/lib-storage/libdovecot-storage.la'
LIBDOVECOT_LOGIN='$(top_builddir)/src/login-common/libdovecot-login.la'
LIBDOVECOT_LDA='$(top_builddir)/src/lib-lda/libdovecot-lda.la'
else
@@ -2515,14 +2518,16 @@
LIBDOVECOT="$LIBDOVECOT_DEPS \$(LIBICONV)"
LIBDOVECOT_STORAGE_LAST='$(top_builddir)/src/lib-storage/list/libstorage_list.la $(top_builddir)/src/lib-storage/index/libstorage_index.la $(top_builddir)/src/lib-storage/libstorage.la $(top_builddir)/src/lib-index/libindex.la'
LIBDOVECOT_STORAGE_FIRST='$(top_builddir)/src/lib-storage/libstorage_service.la $(top_builddir)/src/lib-storage/register/libstorage_register.la'
- LIBDOVECOT_STORAGE="$LIBDOVECOT_STORAGE_FIRST $LINKED_STORAGE_LIBS $LIBDOVECOT_STORAGE_LAST"
+ LIBDOVECOT_STORAGE_DEPS="$LIBDOVECOT_STORAGE_FIRST $LINKED_STORAGE_LIBS $LIBDOVECOT_STORAGE_LAST"
LIBDOVECOT_LOGIN='$(top_builddir)/src/login-common/liblogin.la $(top_builddir)/src/lib-ssl-iostream/libssl_iostream.la'
LIBDOVECOT_LDA='$(top_builddir)/src/lib-lda/liblda.la'
fi
+LIBDOVECOT_STORAGE="$LIBDOVECOT_STORAGE_DEPS $LINKED_STORAGE_LDADD"
LIBDOVECOT_SQL='$(top_builddir)/src/lib-sql/libsql.la'
AC_SUBST(LIBDOVECOT)
AC_SUBST(LIBDOVECOT_DEPS)
AC_SUBST(LIBDOVECOT_STORAGE)
+AC_SUBST(LIBDOVECOT_STORAGE_DEPS)
AC_SUBST(LIBDOVECOT_LOGIN)
AC_SUBST(LIBDOVECOT_SQL)
AC_SUBST(LIBDOVECOT_LDA)
diff -r a743cc250208 -r e540404debb7 dovecot-config.in.in
--- a/dovecot-config.in.in Sun Mar 04 15:21:21 2012 +0200
+++ b/dovecot-config.in.in Sun Mar 04 15:30:31 2012 +0200
@@ -13,7 +13,7 @@
LIBDOVECOT_LOGIN_DEPS="@LIBDOVECOT_LOGIN@"
LIBDOVECOT_SQL_DEPS="@LIBDOVECOT_SQL@"
LIBDOVECOT_LDA_DEPS="@LIBDOVECOT_LDA@"
-LIBDOVECOT_STORAGE_DEPS="@LIBDOVECOT_STORAGE@"
+LIBDOVECOT_STORAGE_DEPS="@LIBDOVECOT_STORAGE_DEPS@"
LIBDOVECOT_INCLUDE="-I$(incdir) -I$(incdir)/src/lib -I$(incdir)/src/lib-dict -I$(incdir)/src/lib-dns -I$(incdir)/src/lib-mail -I$(incdir)/src/lib-imap -I$(incdir)/src/lib-fs -I$(incdir)/src/lib-charset"
LIBDOVECOT_LDA_INCLUDE="-I$(incdir)/src/lib-lda -I$(incdir)/src/lda"
diff -r a743cc250208 -r e540404debb7 src/auth/Makefile.am
--- a/src/auth/Makefile.am Sun Mar 04 15:21:21 2012 +0200
+++ b/src/auth/Makefile.am Sun Mar 04 15:30:31 2012 +0200
@@ -167,7 +167,7 @@
libauthdb_imap_la_LIBADD = \
../lib-imap-client/libimap_client.la \
../lib-ssl-iostream/libssl_iostream.la \
- $(LIBDOVECOT)
+ $(LIBDOVECOT) $(SSL_LIBS)
libauthdb_imap_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir)/src/lib-imap \
diff -r a743cc250208 -r e540404debb7 src/doveadm/Makefile.am
--- a/src/doveadm/Makefile.am Sun Mar 04 15:21:21 2012 +0200
+++ b/src/doveadm/Makefile.am Sun Mar 04 15:30:31 2012 +0200
@@ -39,26 +39,29 @@
libs = \
dsync/libdsync.a \
- $(LIBDOVECOT_STORAGE) \
$(unused_objects)
doveadm_LDADD = \
$(libs) \
$(cmd_pw_libs) \
$(CRYPT_LIBS) \
+ $(LIBDOVECOT_STORAGE) \
$(LIBDOVECOT) \
$(MODULE_LIBS)
doveadm_DEPENDENCIES = \
$(libs) \
$(cmd_pw_libs) \
+ $(LIBDOVECOT_STORAGE_DEPS) \
$(LIBDOVECOT_DEPS)
doveadm_server_LDADD = \
$(libs) \
+ $(LIBDOVECOT_STORAGE) \
$(LIBDOVECOT) \
$(MODULE_LIBS)
doveadm_server_DEPENDENCIES = \
$(libs) \
+ $(LIBDOVECOT_STORAGE_DEPS) \
$(LIBDOVECOT_DEPS)
common = \
diff -r a743cc250208 -r e540404debb7 src/doveadm/dsync/Makefile.am
--- a/src/doveadm/dsync/Makefile.am Sun Mar 04 15:21:21 2012 +0200
+++ b/src/doveadm/dsync/Makefile.am Sun Mar 04 15:30:31 2012 +0200
@@ -11,9 +11,6 @@
-I$(top_srcdir)/src/lib-storage \
-I$(top_srcdir)/src/doveadm
-libs = \
- $(LIBDOVECOT_STORAGE)
-
libdsync_a_SOURCES = \
doveadm-dsync.c \
dsync-brain.c \
diff -r a743cc250208 -r e540404debb7 src/imap/Makefile.am
--- a/src/imap/Makefile.am Sun Mar 04 15:21:21 2012 +0200
+++ b/src/imap/Makefile.am Sun Mar 04 15:30:31 2012 +0200
@@ -19,12 +19,15 @@
../lib/mountpoint.o
endif
-libs = \
+imap_LDADD = \
+ $(unused_objects) \
$(LIBDOVECOT_STORAGE) \
- $(unused_objects)
-
-imap_LDADD = $(libs) $(LIBDOVECOT) $(MODULE_LIBS)
-imap_DEPENDENCIES = $(libs) $(LIBDOVECOT_DEPS)
+ $(LIBDOVECOT) \
+ $(MODULE_LIBS)
+imap_DEPENDENCIES = \
+ $(unused_objects) \
+ $(LIBDOVECOT_STORAGE_DEPS) \
+ $(LIBDOVECOT_DEPS)
cmds = \
cmd-append.c \
diff -r a743cc250208 -r e540404debb7 src/indexer/Makefile.am
--- a/src/indexer/Makefile.am Sun Mar 04 15:21:21 2012 +0200
+++ b/src/indexer/Makefile.am Sun Mar 04 15:30:31 2012 +0200
@@ -27,12 +27,15 @@
../lib-storage/mail-search-parser-imap.o
endif
-libs = \
+indexer_worker_LDADD = \
+ $(unused_objects) \
$(LIBDOVECOT_STORAGE) \
- $(unused_objects)
-
-indexer_worker_LDADD = $(libs) $(LIBDOVECOT) $(MODULE_LIBS)
-indexer_worker_DEPENDENCIES = $(libs) $(LIBDOVECOT_DEPS)
+ $(LIBDOVECOT) \
+ $(MODULE_LIBS)
+indexer_worker_DEPENDENCIES = \
+ $(unused_objects) \
+ $(LIBDOVECOT_STORAGE_DEPS) \
+ $(LIBDOVECOT_DEPS)
indexer_worker_SOURCES = \
indexer-worker.c \
indexer-worker-settings.c \
diff -r a743cc250208 -r e540404debb7 src/lda/Makefile.am
--- a/src/lda/Makefile.am Sun Mar 04 15:21:21 2012 +0200
+++ b/src/lda/Makefile.am Sun Mar 04 15:30:31 2012 +0200
@@ -26,11 +26,17 @@
libs = \
$(unused_objects) \
- $(LIBDOVECOT_STORAGE) \
$(LIBDOVECOT_LDA)
-dovecot_lda_LDADD = $(libs) $(LIBDOVECOT) $(MODULE_LIBS)
-dovecot_lda_DEPENDENCIES = $(libs) $(LIBDOVECOT_DEPS)
+dovecot_lda_LDADD = \
+ $(libs) \
+ $(LIBDOVECOT_STORAGE) \
+ $(LIBDOVECOT) \
+ $(MODULE_LIBS)
+dovecot_lda_DEPENDENCIES = \
+ $(libs) \
+ $(LIBDOVECOT_STORAGE_DEPS) \
+ $(LIBDOVECOT_DEPS)
dovecot_lda_SOURCES = \
main.c
diff -r a743cc250208 -r e540404debb7 src/lib-storage/Makefile.am
--- a/src/lib-storage/Makefile.am Sun Mar 04 15:21:21 2012 +0200
+++ b/src/lib-storage/Makefile.am Sun Mar 04 15:30:31 2012 +0200
@@ -75,6 +75,7 @@
mailbox-uidvalidity.h
shlibs = \
+ @LINKED_STORAGE_LIBS@ \
libstorage.la \
libstorage_service.la \
list/libstorage_list.la \
diff -r a743cc250208 -r e540404debb7 src/lib-storage/index/Makefile.am
--- a/src/lib-storage/index/Makefile.am Sun Mar 04 15:21:21 2012 +0200
+++ b/src/lib-storage/index/Makefile.am Sun Mar 04 15:30:31 2012 +0200
@@ -32,9 +32,6 @@
index-thread-links.c \
index-transaction.c
-libstorage_index_la_LIBADD = @LINKED_STORAGE_LIBS@
-libstorage_index_la_DEPENDENCIES = @LINKED_STORAGE_LIBS@
-
headers = \
istream-attachment.h \
istream-mail.h \
diff -r a743cc250208 -r e540404debb7 src/login-common/Makefile.am
--- a/src/login-common/Makefile.am Sun Mar 04 15:21:21 2012 +0200
+++ b/src/login-common/Makefile.am Sun Mar 04 15:30:31 2012 +0200
@@ -40,6 +40,6 @@
pkglib_LTLIBRARIES = libdovecot-login.la
libdovecot_login_la_SOURCES =
-libdovecot_login_la_LIBADD = liblogin.la ../lib-ssl-iostream/libssl_iostream.la ../lib-dovecot/libdovecot.la
+libdovecot_login_la_LIBADD = liblogin.la ../lib-ssl-iostream/libssl_iostream.la ../lib-dovecot/libdovecot.la $(SSL_LIBS)
libdovecot_login_la_DEPENDENCIES = liblogin.la
libdovecot_login_la_LDFLAGS = -export-dynamic
diff -r a743cc250208 -r e540404debb7 src/plugins/fts-squat/Makefile.am
--- a/src/plugins/fts-squat/Makefile.am Sun Mar 04 15:21:21 2012 +0200
+++ b/src/plugins/fts-squat/Makefile.am Sun Mar 04 15:30:31 2012 +0200
@@ -37,9 +37,11 @@
squat-trie.lo \
squat-uidlist.lo
-libs = \
+squat_test_LDADD = \
+ $(common_objects) \
$(LIBDOVECOT_STORAGE) \
- $(common_objects)
-
-squat_test_LDADD = $(libs) $(LIBDOVECOT)
-squat_test_DEPENDENCIES = $(libs) $(LIBDOVECOT_DEPS)
+ $(LIBDOVECOT)
+squat_test_DEPENDENCIES = \
+ $(common_objects) \
+ $(LIBDOVECOT_STORAGE_DEPS) \
+ $(LIBDOVECOT_DEPS)
diff -r a743cc250208 -r e540404debb7 src/pop3/Makefile.am
--- a/src/pop3/Makefile.am Sun Mar 04 15:21:21 2012 +0200
+++ b/src/pop3/Makefile.am Sun Mar 04 15:30:31 2012 +0200
@@ -19,12 +19,15 @@
../lib-storage/mail-search-parser-imap.o
endif
-libs = \
+pop3_LDADD = \
+ $(unused_objects) \
$(LIBDOVECOT_STORAGE) \
- $(unused_objects)
-
-pop3_LDADD = $(libs) $(LIBDOVECOT) $(MODULE_LIBS)
-pop3_DEPENDENCIES = $(libs) $(LIBDOVECOT_DEPS)
+ $(LIBDOVECOT) \
+ $(MODULE_LIBS)
+pop3_DEPENDENCIES = \
+ $(unused_objects) \
+ $(LIBDOVECOT_STORAGE_DEPS) \
+ $(LIBDOVECOT_DEPS)
pop3_SOURCES = \
main.c \
diff -r a743cc250208 -r e540404debb7 src/util/Makefile.am
--- a/src/util/Makefile.am Sun Mar 04 15:21:21 2012 +0200
+++ b/src/util/Makefile.am Sun Mar 04 15:30:31 2012 +0200
@@ -27,8 +27,13 @@
rawlog_SOURCES = \
rawlog.c
-script_login_LDADD = $(LIBDOVECOT_STORAGE) $(LIBDOVECOT) $(MODULE_LIBS)
-script_login_DEPENDENCIES = $(LIBDOVECOT_STORAGE) $(LIBDOVECOT_DEPS)
+script_login_LDADD = \
+ $(LIBDOVECOT_STORAGE) \
+ $(LIBDOVECOT) \
+ $(MODULE_LIBS)
+script_login_DEPENDENCIES = \
+ $(LIBDOVECOT_STORAGE_DEPS) \
+ $(LIBDOVECOT_DEPS)
script_login_SOURCES = \
script-login.c
More information about the dovecot-cvs
mailing list