lib-ssl-iostream: Remove libdovecot_openssl_common.la

Using such a library results in the same code being duplicated (in OSX) in
both libssl_iostream_openssl.so and libdcrypt_openssl.so.  This breaks the
idea of openssl_init_refcount, because each one will have their own one.

libdcrypt_openssl.so now links to libssl_iostream_openssl.so, which
shouldn't really be a problem, because lib-ssl-iostream is part of the core
libdovecot.so already. It would have been possible to also install
libdovecot_openssl_common.so and link it to both libssl_iostream_openssl.so
and libdcrypt_openssl.so, but that seems unnecessarily complicated.

diff --git a/src/lib-dcrypt/Makefile.am b/src/lib-dcrypt/Makefile.am
index 2bd82d0914d5b3bde931da212802f6d938e895b9..6d8b5d737719c6837cdaaf3c81855da6798ff982 100644 (file)
--- a/src/lib-dcrypt/Makefile.am
+++ b/src/lib-dcrypt/Makefile.am
@@ -20,9 +20,9 @@ libdcrypt_la_CFLAGS = $(AM_CPPFLAGS) \
 if BUILD_DCRYPT_OPENSSL
 pkglib_LTLIBRARIES += libdcrypt_openssl.la
 libdcrypt_openssl_la_SOURCES = dcrypt-openssl.c
-libdcrypt_openssl_la_LDFLAGS = -module -avoid-version ../lib-ssl-iostream/libdovecot_openssl_common.la
+libdcrypt_openssl_la_LDFLAGS = -module -avoid-version ../lib-ssl-iostream/libssl_iostream_openssl.la
 libdcrypt_openssl_la_LIBADD = $(SSL_LIBS)
-libdcrypt_openssl_la_DEPENDENCIES = ../lib-ssl-iostream/libdovecot_openssl_common.la
+libdcrypt_openssl_la_DEPENDENCIES = ../lib-ssl-iostream/libssl_iostream_openssl.la
 libdcrypt_openssl_la_CFLAGS = $(AM_CPPFLAGS) \
        $(SSL_CFLAGS)
 endif

diff --git a/src/lib-ssl-iostream/Makefile.am b/src/lib-ssl-iostream/Makefile.am
index 92bae129eeefe03e9bf913f8f4524a11c5f1d916..f6cb95ad88a9c2266d0f92bae9e353e955b39dbf 100644 (file)
--- a/src/lib-ssl-iostream/Makefile.am
+++ b/src/lib-ssl-iostream/Makefile.am
@@ -10,14 +10,10 @@ AM_CPPFLAGS = \
 if BUILD_OPENSSL
 module_LTLIBRARIES = libssl_iostream_openssl.la
 
-noinst_LTLIBRARIES += libdovecot_openssl_common.la
-libdovecot_openssl_common_la_LIBADD = $(SSL_LIBS)
-libdovecot_openssl_common_la_SOURCES = \
-       dovecot-openssl-common.c
-
 libssl_iostream_openssl_la_LDFLAGS = -module -avoid-version
-libssl_iostream_openssl_la_LIBADD = libdovecot_openssl_common.la $(SSL_LIBS)
+libssl_iostream_openssl_la_LIBADD = $(SSL_LIBS)
 libssl_iostream_openssl_la_SOURCES = \
+       dovecot-openssl-common.c \
        iostream-openssl.c \
        iostream-openssl-common.c \
        iostream-openssl-context.c \