Mercurial > dovecot > core-2.2

changeset 21232:7bb1cb2102d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-dcrypt: Use module_dir setting
author Aki Tuomi <aki.tuomi@dovecot.fi>
date Fri, 25 Nov 2016 09:49:25 +0200
parents 60ada98565d8
children fa9a9c236232
files src/lib-dcrypt/Makefile.am src/lib-dcrypt/test-crypto.c src/lib-dcrypt/test-stream.c
diffstat 3 files changed, 14 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-dcrypt/Makefile.am	Fri Nov 25 09:48:43 2016 +0200
+++ b/src/lib-dcrypt/Makefile.am	Fri Nov 25 09:49:25 2016 +0200
@@ -6,7 +6,8 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib \
 	-I$(top_srcdir)/src/lib-test \
-	-I$(top_srcdir)/src/lib-ssl-iostream
+	-I$(top_srcdir)/src/lib-ssl-iostream \
+	-DDCRYPT_MODULE_DIR=\"$(pkglibdir)\"
 
 libdcrypt_la_SOURCES = \
 	dcrypt.c \
@@ -25,7 +26,6 @@
 libdcrypt_openssl_la_LIBADD = $(SSL_LIBS)
 libdcrypt_openssl_la_DEPENDENCIES = ../lib-ssl-iostream/libdovecot_openssl_common.la ../lib/liblib.la
 libdcrypt_openssl_la_CFLAGS = $(AM_CPPFLAGS) \
-	-DDCRYPT_MODULE_DIR=\"$(pkglibdir)\" \
 	$(SSL_CFLAGS)
 endif
 
@@ -63,10 +63,10 @@
 
 test_crypto_LDADD = $(LIBDOVECOT_TEST)
 test_crypto_DEPENDENCIES = $(LIBDOVECOT_TEST_DEPS)
-test_crypto_CFLAGS = $(AM_CPPFLAGS) -DDCRYPT_MODULE_DIR=\".libs\" -DDCRYPT_SRC_DIR=\"$(top_srcdir)/src/lib-dcrypt\"
+test_crypto_CFLAGS = $(AM_CPPFLAGS) -DDCRYPT_SRC_DIR=\"$(top_srcdir)/src/lib-dcrypt\"
 test_crypto_SOURCES = $(libdcrypt_la_SOURCES) test-crypto.c
 
 test_stream_LDADD = $(LIBDOVECOT_TEST)
 test_stream_DEPENDENCIES = $(LIBDOVECOT_TEST_DEPS)
-test_stream_CFLAGS = $(AM_CPPFLAGS) -DDCRYPT_MODULE_DIR=\".libs\" -DDCRYPT_SRC_DIR=\"$(top_srcdir)/src/lib-dcrypt\"
+test_stream_CFLAGS = $(AM_CPPFLAGS) -DDCRYPT_SRC_DIR=\"$(top_srcdir)/src/lib-dcrypt\"
 test_stream_SOURCES = $(libdcrypt_la_SOURCES) test-stream.c
--- a/src/lib-dcrypt/test-crypto.c	Fri Nov 25 09:48:43 2016 +0200
+++ b/src/lib-dcrypt/test-crypto.c	Fri Nov 25 09:49:25 2016 +0200
@@ -750,8 +750,12 @@
 }
 
 int main(void) {
+	struct dcrypt_settings set = {
+		.module_dir = ".libs"
+	};
+
 	random_init();
-	if (!dcrypt_initialize(NULL, NULL, NULL)) {
+	if (!dcrypt_initialize(NULL, &set, NULL)) {
 		i_error("No functional dcrypt backend found - skipping tests");
 		return 0;
 	}
--- a/src/lib-dcrypt/test-stream.c	Fri Nov 25 09:48:43 2016 +0200
+++ b/src/lib-dcrypt/test-stream.c	Fri Nov 25 09:49:25 2016 +0200
@@ -522,7 +522,11 @@
 }
 
 int main(void) {
-	if (!dcrypt_initialize(NULL, NULL, NULL)) {
+	struct dcrypt_settings set = {
+		.module_dir = ".libs"
+	};
+
+	if (!dcrypt_initialize(NULL, &set, NULL)) {
 		i_error("No functional dcrypt backend found - skipping tests");
 		return 0;
 	}