dcrypt: Fix linkage into libdovecot.so

diff --git a/configure.ac b/configure.ac
index b30d687ac68177a115a11355a6bdf48774aa292d..45dad880b94b86fda0889c7a1820df8f13af5d3c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2545,10 +2545,13 @@ dnl ** Shared libraries usage
 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 "I/O notifys .... : $have_notify"
 echo "SSL ............ : $have_ssl"
 echo "GSSAPI ......... : $have_gssapi"
 echo "passdbs ........ :$passdb"
+echo "dcrypt ..........: $build_dcrypt"
+
 if test "$not_passdb" != ""; then
   echo "                 :$not_passdb"
 fi

diff --git a/src/lib-dcrypt/Makefile.am b/src/lib-dcrypt/Makefile.am
index 946590e7b74ed8ecd1a1843163e3e39f89e556f8..7d691ad8d8075b4dbdad6f19bf5fd0ebd37789c7 100644 (file)
--- a/src/lib-dcrypt/Makefile.am
+++ b/src/lib-dcrypt/Makefile.am
@@ -14,6 +14,8 @@ libdcrypt_la_SOURCES = \
 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