--- a/configure.ac	Tue Aug 09 18:06:25 2016 +0300
+++ b/configure.ac	Thu Aug 11 14:28:24 2016 +0300
@@ -1677,6 +1677,7 @@
 dnl **
 
 have_ssl=no
+build_dcrypt_openssl=no
 
 if test $want_openssl != no && test $have_ssl = no; then
   if test "$PKG_CONFIG" != "" && $PKG_CONFIG --exists openssl 2>/dev/null; then
@@ -1704,7 +1705,7 @@
   if test "$have_openssl" = "yes"; then
     AC_DEFINE(HAVE_OPENSSL,, [Build with OpenSSL support])
     have_ssl="yes (OpenSSL)"
-    build_dcrypt="no"
+    build_dcrypt_openssl="no"
 
     AC_CHECK_LIB(ssl, SSL_get_current_compression, [
       AC_DEFINE(HAVE_SSL_COMPRESSION,, [Build with OpenSSL compression])
@@ -1716,13 +1717,14 @@
       AC_DEFINE(HAVE_SSL_COMP_FREE_COMPRESSION_METHODS,, [Build with SSL_COMP_free_compression_methods() support])
     ],, $SSL_LIBS)
     AC_CHECK_LIB(ssl, [EC_KEY_new],
-       [build_dcrypt="yes"],
+       [build_dcrypt_openssl="yes"],
        AC_MSG_WARN([No ECC support in OpenSSL - not enabling dcrypt]),
     $SSL_LIBS)
   fi
 fi
+
 AM_CONDITIONAL(BUILD_OPENSSL, test "$have_openssl" = "yes")
-AM_CONDITIONAL(HAVE_DCRYPT, test "$build_dcrypt" != "no")
+AM_CONDITIONAL(BUILD_DCRYPT_OPENSSL, test "$build_dcrypt_openssl" = "yes")
 
 if test $want_gnutls != no && test $have_ssl = no; then
   AC_CHECK_LIB(gnutls, gnutls_global_init, [
@@ -2544,13 +2546,8 @@
 dnl ** Shared libraries usage
 dnl **
 
-if test "$build_dcrypt" = "yes"; then
-  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'
-LIBDOVECOT_LA_LIBS="$LIBDOVECOT_LA_LIBS $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 $(top_builddir)/src/lib-dcrypt/libdcrypt.la $(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'
@@ -3014,7 +3011,7 @@
 echo "SSL ............ : $have_ssl"
 echo "GSSAPI ......... : $have_gssapi"
 echo "passdbs ........ :$passdb"
-echo "dcrypt ..........: $build_dcrypt"
+echo "dcrypt ..........: $build_dcrypt_openssl"
 
 if test "$not_passdb" != ""; then
   echo "                 :$not_passdb"

--- a/src/Makefile.am	Tue Aug 09 18:06:25 2016 +0300
+++ b/src/Makefile.am	Thu Aug 11 14:28:24 2016 +0300
@@ -2,10 +2,6 @@
 LIB_LDAP=lib-ldap
 endif
 
-if HAVE_DCRYPT
-LIB_DCRYPT=lib-dcrypt
-endif
-
 LIBDOVECOT_SUBDIRS = \
 	lib-test \
 	lib \
@@ -14,7 +10,7 @@
 	lib-master \
 	lib-charset \
 	lib-ssl-iostream \
-	$(LIB_DCRYPT) \
+	lib-dcrypt \
 	lib-dns \
 	lib-dict \
 	lib-sasl \

--- a/src/lib-dcrypt/Makefile.am	Tue Aug 09 18:06:25 2016 +0300
+++ b/src/lib-dcrypt/Makefile.am	Thu Aug 11 14:28:24 2016 +0300
@@ -16,7 +16,7 @@
 
 libdcrypt_la_LDFLAGS = -export-dynamic
 
-if BUILD_OPENSSL
+if BUILD_DCRYPT_OPENSSL
 pkglib_LTLIBRARIES += libdcrypt_openssl.la
 libdcrypt_openssl_la_SOURCES = dcrypt-openssl.c dcrypt.c
 libdcrypt_openssl_la_LDFLAGS = -module -avoid-version -shared ../lib-ssl-iostream/libdovecot_openssl_common.la ../lib/liblib.la