lib-http: Link test-http-client libssl_iostream_openssl.so directly.

This way it can be run without having to do make install first.

diff --git a/src/lib-http/Makefile.am b/src/lib-http/Makefile.am
index 967002e7b81fb5361de383d15c482028cb295a63..6e3e2e410e490d4f2a670fe34650bb4e966c26b2 100644 (file)
--- a/src/lib-http/Makefile.am
+++ b/src/lib-http/Makefile.am
@@ -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)
 

diff --git a/src/lib-http/test-http-client.c b/src/lib-http/test-http-client.c
index 3b3a26c156c465889b4462ad922dcd405491d279..f3ffeede705cc4ddb0c2200c893e8f70d4bd0a4b 100644 (file)
--- a/src/lib-http/test-http-client.c
+++ b/src/lib-http/test-http-client.c
@@ -8,6 +8,8 @@
 #include "http-url.h"
 #include "http-client.h"
 #include "dns-lookup.h"
+#include "iostream-ssl.h"
+#include "iostream-openssl.h"
 
 struct http_test_request {
        struct io *io;
@@ -340,6 +342,7 @@ int main(int argc, char *argv[])
        struct ioloop *ioloop;
 
        lib_init();
+       iostream_openssl_init();
 
        ioloop = io_loop_create();
        io_loop_set_running(ioloop);
@@ -393,5 +396,6 @@ int main(int argc, char *argv[])
        dns_client_deinit(&dns_client);
 
        io_loop_destroy(&ioloop);
+       iostream_openssl_deinit();
        lib_deinit();
 }