diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-07-08 13:01:02 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-07-08 13:01:02 -0700 |
| commit | 5a79053244e60d794c26094de6d1f07b2a4ba233 (patch) | |
| tree | 9598d5f571b7c357fe07c1299a991fb5c3f9e9fe | |
| parent | 1be0437ea58896e5a7768f6b2b1da080c043bbfd (diff) | |
Added OpenSSL NPN pkg-config check
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | templates/Makefile.template | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -374,6 +374,7 @@ endif ifeq ($(HAS_PKG_CONFIG),true) OPENSSL_ALPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.2 openssl +OPENSSL_ALPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.1 openssl ZLIB_CHECK_CMD = $(PKG_CONFIG) --exists zlib PERFTOOLS_CHECK_CMD = $(PKG_CONFIG) --exists profiler PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.0.0-alpha-3 protobuf diff --git a/templates/Makefile.template b/templates/Makefile.template index aa09a84727..6de63f341c 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -399,6 +399,7 @@ endif ifeq ($(HAS_PKG_CONFIG),true) OPENSSL_ALPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.2 openssl +OPENSSL_ALPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.1 openssl ZLIB_CHECK_CMD = $(PKG_CONFIG) --exists zlib PERFTOOLS_CHECK_CMD = $(PKG_CONFIG) --exists profiler PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.0.0-alpha-3 protobuf |