diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-08-23 14:59:39 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-08-23 14:59:39 -0700 |
| commit | 668bf881a9449cc4f9885e4d3492e2cbe7476925 (patch) | |
| tree | cb1c019f2f5806d9acdb3d3f570a487b43f21c73 /templates/Makefile.template | |
| parent | 56d7044ed808e08af8b7a812a140bd751622f15c (diff) | |
| parent | d25c1d2a6c5ce6b0696a99c042e7c7026ac1a00c (diff) | |
Merge pull request #7802 from nicolasnoble/upmerge-from-v1.0.x
Upmerge from v1.0.x
Diffstat (limited to 'templates/Makefile.template')
| -rw-r--r-- | templates/Makefile.template | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 6a7805cf6d..e6a28d16bc 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -380,7 +380,7 @@ OPENSSL_ALPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.2 openssl OPENSSL_NPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.1 openssl ZLIB_CHECK_CMD = $(PKG_CONFIG) --exists zlib - PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.0.0-alpha-3 protobuf + PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.0.0 protobuf else # HAS_PKG_CONFIG ifeq ($(SYSTEM),MINGW32) |