From: Aki Tuomi Date: Tue, 21 Nov 2017 20:13:17 +0000 (+0200) Subject: lib-dcrypt: test-crypto and test-stream need lib-ssl-iostream.a fully X-Git-Tag: 2.3.0.rc1~335 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86ad487452c763152f3ff4dd4650512f3cecdc55;p=thirdparty%2Fdovecot%2Fcore.git lib-dcrypt: test-crypto and test-stream need lib-ssl-iostream.a fully Otherwise the .so file cannot be loaded due to missing symbols --- diff --git a/src/lib-dcrypt/Makefile.am b/src/lib-dcrypt/Makefile.am index 2dcdf956dc..e9e5116953 100644 --- a/src/lib-dcrypt/Makefile.am +++ b/src/lib-dcrypt/Makefile.am @@ -60,10 +60,16 @@ LIBDOVECOT_TEST = \ test_crypto_LDADD = $(LIBDOVECOT_TEST) test_crypto_DEPENDENCIES = $(LIBDOVECOT_TEST_DEPS) +if HAVE_WHOLE_ARCHIVE +test_crypto_LDFLAGS = -Wl,$(LD_WHOLE_ARCHIVE),../lib-ssl-iostream/.libs/libssl_iostream.a,$(LD_NO_WHOLE_ARCHIVE) +endif test_crypto_CFLAGS = $(AM_CPPFLAGS) -DDCRYPT_SRC_DIR=\"$(top_srcdir)/src/lib-dcrypt\" test_crypto_SOURCES = $(libdcrypt_la_SOURCES) test-crypto.c test_stream_LDADD = $(LIBDOVECOT_TEST) test_stream_DEPENDENCIES = $(LIBDOVECOT_TEST_DEPS) +if HAVE_WHOLE_ARCHIVE +test_stream_LDFLAGS = -Wl,$(LD_WHOLE_ARCHIVE),../lib-ssl-iostream/.libs/libssl_iostream.a,$(LD_NO_WHOLE_ARCHIVE) +endif test_stream_CFLAGS = $(AM_CPPFLAGS) -DDCRYPT_SRC_DIR=\"$(top_srcdir)/src/lib-dcrypt\" test_stream_SOURCES = $(libdcrypt_la_SOURCES) test-stream.c