Fixed linking with OSX.

diff --git a/src/lib-dcrypt/Makefile.am b/src/lib-dcrypt/Makefile.am
index 1ea6f74d21d4284661d54caec15162813cca4b38..ea75e0c1f9213ba03861e944e7a3dac1c679070b 100644 (file)
--- 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 b990e93fdf3b7072052877e471c36fb58302ee86..5407d1a6868a219b1cf6b40bf9a38d2ef066b415 100644 (file)
--- 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