From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Fri, 25 Nov 2016 07:49:25 +0000 (+0200)
Subject: lib-dcrypt: Use module_dir setting
X-Git-Tag: 2.2.27~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f581a8d198c6d15d152b3ce10cbe1af853bb9e7d;p=thirdparty%2Fdovecot%2Fcore.git

lib-dcrypt: Use module_dir setting
---

diff --git a/src/lib-dcrypt/Makefile.am b/src/lib-dcrypt/Makefile.am
index dbb170e5a3..dd491598cc 100644
--- a/src/lib-dcrypt/Makefile.am
+++ b/src/lib-dcrypt/Makefile.am
@@ -6,7 +6,8 @@ NOPLUGIN_LDFLAGS=
 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_LDFLAGS = -module -avoid-version -shared ../lib-ssl-iostrea
 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 @@ LIBDOVECOT_TEST = \
 
 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
diff --git a/src/lib-dcrypt/test-crypto.c b/src/lib-dcrypt/test-crypto.c
index 32e420472b..d8695e5116 100644
--- a/src/lib-dcrypt/test-crypto.c
+++ b/src/lib-dcrypt/test-crypto.c
@@ -750,8 +750,12 @@ void test_load_invalid_keys(void) {
 }
 
 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;
 	}
diff --git a/src/lib-dcrypt/test-stream.c b/src/lib-dcrypt/test-stream.c
index 51913e9899..f468eda563 100644
--- a/src/lib-dcrypt/test-stream.c
+++ b/src/lib-dcrypt/test-stream.c
@@ -522,7 +522,11 @@ void test_free_keys() {
 }
 
 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;
 	}