Merge pull request #7744 from y-zeng/makefile-ga

Update required protobuf version to v3.0.0
9 years ago · bbdebaae28
parent fc8c12d48b d4df55e115
commit bbdebaae28
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -469,7 +469,7 @@ ifeq ($(HAS_PKG_CONFIG),true)
 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)
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@ -357,7 +357,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)