From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Sun, 5 Feb 2017 18:22:27 +0000 (+0200)
Subject: lib-dcrypt: Don't link liblib.la to libdcrypt_openssl.so
X-Git-Tag: 2.3.0.rc1~2179
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7d1fec9fa3799aaa4c3339d26c610c043d59360;p=thirdparty%2Fdovecot%2Fcore.git

lib-dcrypt: Don't link liblib.la to libdcrypt_openssl.so

At best this does nothing, at worst (like with OSX) it duplicates the
entire liblib and creates split state between the two instances.
---

diff --git a/src/lib-dcrypt/Makefile.am b/src/lib-dcrypt/Makefile.am
index f9c7c2af26..1dbdea02bb 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 -shared ../lib-ssl-iostream/libdovecot_openssl_common.la ../lib/liblib.la
+libdcrypt_openssl_la_LDFLAGS = -module -avoid-version -shared ../lib-ssl-iostream/libdovecot_openssl_common.la
 libdcrypt_openssl_la_LIBADD = $(SSL_LIBS)
-libdcrypt_openssl_la_DEPENDENCIES = ../lib-ssl-iostream/libdovecot_openssl_common.la ../lib/liblib.la
+libdcrypt_openssl_la_DEPENDENCIES = ../lib-ssl-iostream/libdovecot_openssl_common.la
 libdcrypt_openssl_la_CFLAGS = $(AM_CPPFLAGS) \
 	$(SSL_CFLAGS)
 endif