From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Tue, 7 Jun 2016 00:47:44 +0000 (+0300)
Subject: Fixed linking with OSX.
X-Git-Tag: 2.3.0.rc1~3521
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b3579352544e7920fd497328b29fb3e06a85768;p=thirdparty%2Fdovecot%2Fcore.git

Fixed linking with OSX.
---

diff --git a/src/lib-dcrypt/Makefile.am b/src/lib-dcrypt/Makefile.am
index 9480f64f7d..cc85c1e812 100644
--- a/src/lib-dcrypt/Makefile.am
+++ b/src/lib-dcrypt/Makefile.am
@@ -15,9 +15,10 @@ libdcrypt_la_CFLAGS = $(AM_CPPFLAGS) \
 
 if BUILD_OPENSSL
 pkglib_LTLIBRARIES += libdcrypt_openssl.la
-libdcrypt_openssl_la_SOURCES = dcrypt-openssl.c
-libdcrypt_openssl_la_LDFLAGS = -module -avoid-version -shared $(SSL_LIBS)
+libdcrypt_openssl_la_SOURCES = dcrypt-openssl.c dcrypt.c
+libdcrypt_openssl_la_LDFLAGS = -module -avoid-version -shared $(SSL_LIBS) ../lib/liblib.la
 libdcrypt_openssl_la_CFLAGS = $(AM_CPPFLAGS) \
+	-DDCRYPT_MODULE_DIR=\"$(pkglibdir)\"
 	$(SSL_CFLAGS)
 endif
 
diff --git a/src/lib-ldap/Makefile.am b/src/lib-ldap/Makefile.am
index b990e93fdf..5407d1a686 100644
--- a/src/lib-ldap/Makefile.am
+++ b/src/lib-ldap/Makefile.am
@@ -17,9 +17,9 @@ libdovecot_ldap_la_SOURCES = \
 	ldap-compare.c \
 	ldap-entry.c
 
-libdovecot_ldap_la_DEPENDENCIES =
+libdovecot_ldap_la_DEPENDENCIES = ../lib/liblib.la
 libdovecot_ldap_la_LDFLAGS = -export-dynamic
-libdovecot_ldap_la_LIBADD = $(LDAP_LIBS)
+libdovecot_ldap_la_LIBADD = ../lib/liblib.la $(LDAP_LIBS)
 
 headers = \
 	ldap-client.h