From: Timo Sirainen Date: Sun, 5 Feb 2017 18:29:10 +0000 (+0200) Subject: lib-ssl-iostream: Remove libdovecot_openssl_common.la X-Git-Tag: 2.3.0.rc1~2175 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6108c1bfa10d5fcd1def9c6a23ebcd5204d1775;p=thirdparty%2Fdovecot%2Fcore.git 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 2bd82d0914..6d8b5d7377 100644 --- 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 92bae129ee..f6cb95ad88 100644 --- 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 \