diff options
author | nnoble <nnoble@google.com> | 2014-12-12 15:43:38 -0800 |
---|---|---|
committer | Nicolas Noble <nnoble@google.com> | 2014-12-12 16:36:51 -0800 |
commit | 69ac39f4be7485d885aa69df1a621379f6fbf7ad (patch) | |
tree | 82737227519871071638b3904c2ca8a4d4f0ae20 /test/build | |
parent | befd26501a6dbc0dca9d12444b4d245fa5560db0 (diff) |
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 <nnoble@google.com>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=82020890
Diffstat (limited to 'test/build')
-rw-r--r-- | test/build/event2.c | 8 | ||||
-rw-r--r-- | test/build/openssl-alpn.c | 10 | ||||
-rw-r--r-- | test/build/zlib.c | 9 |
3 files changed, 27 insertions, 0 deletions
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 <event2/event.h> + +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 <stdlib.h> +#include <openssl/ssl.h> + +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 <stdlib.h> +#include <zlib.h> + +int main() { + deflateInit(Z_NULL, Z_DEFAULT_COMPRESSION); + return 0; +} |