Mercurial > dovecot > core-2.2

changeset 20317:b530dc56ce76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed linking with OSX.
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Tue, 07 Jun 2016 03:47:44 +0300
parents bdefb23415a2
children 2f2e8ac241fb
files src/lib-dcrypt/Makefile.am src/lib-ldap/Makefile.am
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-dcrypt/Makefile.am	Mon Jun 13 12:44:09 2016 +0300
+++ b/src/lib-dcrypt/Makefile.am	Tue Jun 07 03:47:44 2016 +0300
@@ -15,9 +15,10 @@
 
 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
 
--- a/src/lib-ldap/Makefile.am	Mon Jun 13 12:44:09 2016 +0300
+++ b/src/lib-ldap/Makefile.am	Tue Jun 07 03:47:44 2016 +0300
@@ -17,9 +17,9 @@
 	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