Timo Sirainen <t...@iki.fi> wrote:
>> There seems to be a new dependency in some modules (eg, lib-storage,
>> libdovecot-lda, libdovecot-ssl) on OpenSSL. In Dovecot 2.0, those
>> modules didn't require OpenSSL, but 2.1 does.
>>
>> For the linking process the path to the OpenSSL library isn't
>> specified properly (SSL_LIBS). Dovecot fails to build if OpenSSL
>> is in a non-standard path. (Haven't checked if SSL_CFLAGS isn't
>> properly used as well.)
>
> Maybe http://hg.dovecot.org/dovecot-2.1/rev/c07415305d9e fixes
> everything?
That's the way to go. Makes things better, but I've found three more
dependencies. This patch is against the daily snapshot 20120228.
(Sorry for the changes to Makefile.in which you won't need. But this way
I don't have to rebuild Makefile.in from Makefile.am when compiling. ;-)
diff -ur dovecot-20120228.original/src/auth/Makefile.am
dovecot-20120228/src/auth/Makefile.am
--- dovecot-20120228.original/src/auth/Makefile.am 2012-02-26
04:00:02.000000000 +0100
+++ dovecot-20120228/src/auth/Makefile.am 2012-02-29 01:38:41.000000000
+0100
@@ -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 -ur dovecot-20120228.original/src/auth/Makefile.in
dovecot-20120228/src/auth/Makefile.in
--- dovecot-20120228.original/src/auth/Makefile.in 2012-02-28
04:00:12.000000000 +0100
+++ dovecot-20120228/src/auth/Makefile.in 2012-02-29 01:38:44.000000000
+0100
@@ -499,7 +499,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) \
diff -ur dovecot-20120228.original/src/lib-storage/Makefile.am
dovecot-20120228/src/lib-storage/Makefile.am
--- dovecot-20120228.original/src/lib-storage/Makefile.am 2012-02-10
04:00:02.000000000 +0100
+++ dovecot-20120228/src/lib-storage/Makefile.am 2012-02-29
01:38:21.000000000 +0100
@@ -85,7 +85,7 @@
pkglib_LTLIBRARIES = libdovecot-storage.la
libdovecot_storage_la_SOURCES =
-libdovecot_storage_la_LIBADD = $(shlibs) $(MODULE_LIBS)
+libdovecot_storage_la_LIBADD = $(shlibs) $(MODULE_LIBS) $(SSL_LIBS)
libdovecot_storage_la_DEPENDENCIES = $(shlibs)
libdovecot_storage_la_LDFLAGS = -export-dynamic
diff -ur dovecot-20120228.original/src/lib-storage/Makefile.in
dovecot-20120228/src/lib-storage/Makefile.in
--- dovecot-20120228.original/src/lib-storage/Makefile.in 2012-02-28
04:00:15.000000000 +0100
+++ dovecot-20120228/src/lib-storage/Makefile.in 2012-02-29
01:38:21.000000000 +0100
@@ -397,7 +397,7 @@
pkglib_LTLIBRARIES = libdovecot-storage.la
libdovecot_storage_la_SOURCES =
-libdovecot_storage_la_LIBADD = $(shlibs) $(MODULE_LIBS)
+libdovecot_storage_la_LIBADD = $(shlibs) $(MODULE_LIBS) $(SSL_LIBS)
libdovecot_storage_la_DEPENDENCIES = $(shlibs)
libdovecot_storage_la_LDFLAGS = -export-dynamic
test_programs = \
diff -ur dovecot-20120228.original/src/login-common/Makefile.am
dovecot-20120228/src/login-common/Makefile.am
--- dovecot-20120228.original/src/login-common/Makefile.am 2011-11-09
04:00:01.000000000 +0100
+++ dovecot-20120228/src/login-common/Makefile.am 2012-02-29
01:38:21.000000000 +0100
@@ -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 -ur dovecot-20120228.original/src/login-common/Makefile.in
dovecot-20120228/src/login-common/Makefile.in
--- dovecot-20120228.original/src/login-common/Makefile.in 2012-02-28
04:00:18.000000000 +0100
+++ dovecot-20120228/src/login-common/Makefile.in 2012-02-29
01:38:21.000000000 +0100
@@ -320,7 +320,7 @@
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
all: all-am
