From: Timo Sirainen Date: Sun, 4 Mar 2012 13:30:31 +0000 (+0200) Subject: Makefile: Link with SSL_LIBS whenever linking libssl_iostream.la X-Git-Tag: 2.1.2~66 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b71ec9499d47c92e5fd08683106c01e9face17eb;p=thirdparty%2Fdovecot%2Fcore.git Makefile: Link with SSL_LIBS whenever linking libssl_iostream.la --- diff --git a/configure.in b/configure.in index 68c388f8dc..78e6523fc9 100644 --- a/configure.in +++ b/configure.in @@ -2488,10 +2488,13 @@ for storage in $mail_storages; do 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 @@ dnl ** 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 @@ else 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 --git a/dovecot-config.in.in b/dovecot-config.in.in index d32d96e2ad..c65086efd7 100644 --- a/dovecot-config.in.in +++ b/dovecot-config.in.in @@ -13,7 +13,7 @@ LIBDOVECOT_DEPS="@LIBDOVECOT_DEPS@" 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 --git a/src/auth/Makefile.am b/src/auth/Makefile.am index c0fb9a7272..0a2d643da7 100644 --- a/src/auth/Makefile.am +++ b/src/auth/Makefile.am @@ -167,7 +167,7 @@ libauthdb_imap_la_LDFLAGS = -module -avoid-version 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 --git a/src/doveadm/Makefile.am b/src/doveadm/Makefile.am index 8fe1a8fec3..22c5418314 100644 --- a/src/doveadm/Makefile.am +++ b/src/doveadm/Makefile.am @@ -39,26 +39,29 @@ cmd_pw_libs = \ 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 --git a/src/doveadm/dsync/Makefile.am b/src/doveadm/dsync/Makefile.am index 958d5cf3e5..70a2bc2aea 100644 --- a/src/doveadm/dsync/Makefile.am +++ b/src/doveadm/dsync/Makefile.am @@ -11,9 +11,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/doveadm -libs = \ - $(LIBDOVECOT_STORAGE) - libdsync_a_SOURCES = \ doveadm-dsync.c \ dsync-brain.c \ diff --git a/src/imap/Makefile.am b/src/imap/Makefile.am index e420bb453f..d7b66faa72 100644 --- a/src/imap/Makefile.am +++ b/src/imap/Makefile.am @@ -19,12 +19,15 @@ unused_objects = \ ../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 --git a/src/indexer/Makefile.am b/src/indexer/Makefile.am index 88c90892d6..753e304ba2 100644 --- a/src/indexer/Makefile.am +++ b/src/indexer/Makefile.am @@ -27,12 +27,15 @@ unused_objects = \ ../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 --git a/src/lda/Makefile.am b/src/lda/Makefile.am index 619b76e689..c770008c7a 100644 --- a/src/lda/Makefile.am +++ b/src/lda/Makefile.am @@ -26,11 +26,17 @@ endif 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 --git a/src/lib-storage/Makefile.am b/src/lib-storage/Makefile.am index 000496855e..523175aacd 100644 --- a/src/lib-storage/Makefile.am +++ b/src/lib-storage/Makefile.am @@ -75,6 +75,7 @@ headers = \ mailbox-uidvalidity.h shlibs = \ + @LINKED_STORAGE_LIBS@ \ libstorage.la \ libstorage_service.la \ list/libstorage_list.la \ diff --git a/src/lib-storage/index/Makefile.am b/src/lib-storage/index/Makefile.am index 6e7d4773a0..7558e0528c 100644 --- a/src/lib-storage/index/Makefile.am +++ b/src/lib-storage/index/Makefile.am @@ -32,9 +32,6 @@ libstorage_index_la_SOURCES = \ 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 --git a/src/login-common/Makefile.am b/src/login-common/Makefile.am index efe59c7098..e05f2cd288 100644 --- a/src/login-common/Makefile.am +++ b/src/login-common/Makefile.am @@ -40,6 +40,6 @@ pkginc_lib_HEADERS = $(headers) 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 --git a/src/plugins/fts-squat/Makefile.am b/src/plugins/fts-squat/Makefile.am index ba6f5de0da..6c8181cef7 100644 --- a/src/plugins/fts-squat/Makefile.am +++ b/src/plugins/fts-squat/Makefile.am @@ -37,9 +37,11 @@ common_objects = \ 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 --git a/src/pop3/Makefile.am b/src/pop3/Makefile.am index 2a418c0110..2985de4642 100644 --- a/src/pop3/Makefile.am +++ b/src/pop3/Makefile.am @@ -19,12 +19,15 @@ unused_objects = \ ../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 --git a/src/util/Makefile.am b/src/util/Makefile.am index f953855e1c..52c0c6eba5 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -27,8 +27,13 @@ rawlog_DEPENDENCIES = $(LIBDOVECOT_DEPS) 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