Mercurial > dovecot > core-2.2
changeset 20496:bb728a4cbbde
dcrypt: Fix linkage into libdovecot.so
| author | Aki Tuomi <aki.tuomi@dovecot.fi> |
|---|---|
| date | Mon, 04 Jul 2016 18:24:29 +0300 |
| parents | 143b367cc784 |
| children | 06399223cc5e |
| files | configure.ac src/lib-dcrypt/Makefile.am |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Mon Jul 04 15:05:00 2016 +0300 +++ b/configure.ac Mon Jul 04 18:24:29 2016 +0300 @@ -2545,10 +2545,13 @@ dnl ** if test "$build_dcrypt" = "yes"; then - lib_dcrypt="$(top_builddir)/src/lib-dcrypt/libdcrypt.la" + lib_dcrypt='$(top_builddir)/src/lib-dcrypt/libdcrypt.la' fi -LIBDOVECOT_LA_LIBS='$(top_builddir)/src/lib-dict-extra/libdict_extra.la $(top_builddir)/src/lib-master/libmaster.la $(top_builddir)/src/lib-settings/libsettings.la $(top_builddir)/src/lib-stats/libstats.la $(top_builddir)/src/lib-http/libhttp.la $(top_builddir)/src/lib-fs/libfs.la $(top_builddir)/src/lib-dict/libdict.la $(top_builddir)/src/lib-dns/libdns.la $(top_builddir)/src/lib-imap/libimap.la $(top_builddir)/src/lib-mail/libmail.la $(top_builddir)/src/lib-sasl/libsasl.la $(top_builddir)/src/lib-auth/libauth.la $(top_builddir)/src/lib-charset/libcharset.la $(top_builddir)/src/lib-ssl-iostream/libssl_iostream.la $(lib_dcrypt) $(top_builddir)/src/lib-test/libtest.la $(top_builddir)/src/lib/liblib.la' + +LIBDOVECOT_LA_LIBS='$(top_builddir)/src/lib-dict-extra/libdict_extra.la $(top_builddir)/src/lib-master/libmaster.la $(top_builddir)/src/lib-settings/libsettings.la $(top_builddir)/src/lib-stats/libstats.la $(top_builddir)/src/lib-http/libhttp.la $(top_builddir)/src/lib-fs/libfs.la $(top_builddir)/src/lib-dict/libdict.la $(top_builddir)/src/lib-dns/libdns.la $(top_builddir)/src/lib-imap/libimap.la $(top_builddir)/src/lib-mail/libmail.la $(top_builddir)/src/lib-sasl/libsasl.la $(top_builddir)/src/lib-auth/libauth.la $(top_builddir)/src/lib-charset/libcharset.la $(top_builddir)/src/lib-ssl-iostream/libssl_iostream.la' +LIBDOVECOT_LA_LIBS="$LIBDOVECOT_LA_LIBS $lib_dcrypt \$(top_builddir)/src/lib-test/libtest.la \$(top_builddir)/src/lib/liblib.la" + if test "$want_shared_libs" = "yes"; then LIBDOVECOT_DEPS='$(top_builddir)/src/lib-dovecot/libdovecot.la' LIBDOVECOT="$LIBDOVECOT_DEPS \$(MODULE_LIBS)" @@ -3011,6 +3014,8 @@ echo "SSL ............ : $have_ssl" echo "GSSAPI ......... : $have_gssapi" echo "passdbs ........ :$passdb" +echo "dcrypt ..........: $build_dcrypt" + if test "$not_passdb" != ""; then echo " :$not_passdb" fi
--- a/src/lib-dcrypt/Makefile.am Mon Jul 04 15:05:00 2016 +0300 +++ b/src/lib-dcrypt/Makefile.am Mon Jul 04 18:24:29 2016 +0300 @@ -14,6 +14,8 @@ libdcrypt_la_CFLAGS = $(AM_CPPFLAGS) \ -DDCRYPT_MODULE_DIR=\"$(pkglibdir)\" +libdcrypt_la_LDFLAGS = -export-dynamic + if BUILD_OPENSSL pkglib_LTLIBRARIES += libdcrypt_openssl.la libdcrypt_openssl_la_SOURCES = dcrypt-openssl.c dcrypt.c