]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
lib-http: Link test-http-client libssl_iostream_openssl.so directly.
authorTimo Sirainen <timo.sirainen@dovecot.fi>
Fri, 16 Sep 2016 05:39:24 +0000 (08:39 +0300)
committerTimo Sirainen <timo.sirainen@dovecot.fi>
Fri, 16 Sep 2016 05:43:19 +0000 (08:43 +0300)
This way it can be run without having to do make install first.

src/lib-http/Makefile.am
src/lib-http/test-http-client.c

index 967002e7b81fb5361de383d15c482028cb295a63..6e3e2e410e490d4f2a670fe34650bb4e966c26b2 100644 (file)
@@ -158,7 +158,8 @@ test_http_payload_DEPENDENCIES = \
 test_http_client_SOURCES = test-http-client.c
 test_http_client_LDFLAGS = -export-dynamic
 test_http_client_LDADD = \
-       $(test_http_libs)
+       $(test_http_libs) \
+       ../lib-ssl-iostream/libssl_iostream_openssl.la
 test_http_client_DEPENDENCIES = \
        $(test_http_deps)
 
index 7f34f469ed1b2adf18b5e9b8b16c01b1d619a213..46759d69248e2bbd49cd366bc46a0042197b4686 100644 (file)
@@ -9,6 +9,7 @@
 #include "http-client.h"
 #include "dns-lookup.h"
 #include "iostream-ssl.h"
+#include "iostream-openssl.h"
 
 struct http_test_request {
        struct io *io;
@@ -342,6 +343,7 @@ int main(int argc, char *argv[])
        struct ioloop *ioloop;
 
        lib_init();
+       iostream_openssl_init();
 
        ioloop = io_loop_create();
        io_loop_set_running(ioloop);
@@ -398,5 +400,6 @@ int main(int argc, char *argv[])
        dns_client_deinit(&dns_client);
 
        io_loop_destroy(&ioloop);
+       iostream_openssl_deinit();
        lib_deinit();
 }