From 69ac39f4be7485d885aa69df1a621379f6fbf7ad Mon Sep 17 00:00:00 2001 From: nnoble Date: Fri, 12 Dec 2014 15:43:38 -0800 Subject: Makefile will now build zlib and/or OpenSSL if needed. -) Detecting system and embedded presence of zlib and OpenSSL with ALPN. -) Automatically disabling secure targets if no OpenSSL present --> make all won't work if no OpenSSL is present, forcing the users to select the nonsecure Makefile targets explicitely. -) Removing build instructions for OpenSSL - this isn't really necessary anymore. -) Adding more blurb about OpenSSL and the new Makefile features. Change on 2014/12/12 by nnoble ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=82020890 --- test/build/event2.c | 8 ++++++++ test/build/openssl-alpn.c | 10 ++++++++++ test/build/zlib.c | 9 +++++++++ 3 files changed, 27 insertions(+) create mode 100644 test/build/event2.c create mode 100644 test/build/openssl-alpn.c create mode 100644 test/build/zlib.c (limited to 'test') diff --git a/test/build/event2.c b/test/build/event2.c new file mode 100644 index 0000000000..f632b1e43e --- /dev/null +++ b/test/build/event2.c @@ -0,0 +1,8 @@ +/* This is only a compilation test, to see if we have libevent installed. */ + +#include + +int main() { + event_base_new(); + return 0; +} diff --git a/test/build/openssl-alpn.c b/test/build/openssl-alpn.c new file mode 100644 index 0000000000..f7365770f7 --- /dev/null +++ b/test/build/openssl-alpn.c @@ -0,0 +1,10 @@ +/* This is just a compilation test, to see if we have a version of OpenSSL with + ALPN support installed. */ + +#include +#include + +int main() { + SSL_get0_alpn_selected(NULL, NULL, NULL); + return 0; +} diff --git a/test/build/zlib.c b/test/build/zlib.c new file mode 100644 index 0000000000..75bce9ad16 --- /dev/null +++ b/test/build/zlib.c @@ -0,0 +1,9 @@ +/* This is just a compilation test, to see if we have zlib installed. */ + +#include +#include + +int main() { + deflateInit(Z_NULL, Z_DEFAULT_COMPRESSION); + return 0; +} -- cgit v1.2.3