Index: third_party/protobuf/configure.ac |
diff --git a/third_party/protobuf/configure.ac b/third_party/protobuf/configure.ac |
index bdc72ee696801ffae4a74bf1280b6cbc1dd7a2b2..d1e913c63ddc13287444d5d7f1a92d5c6675f8db 100644 |
--- a/third_party/protobuf/configure.ac |
+++ b/third_party/protobuf/configure.ac |
@@ -4,15 +4,20 @@ |
AC_PREREQ(2.59) |
# Note: If you change the version, you must also update it in: |
-# * java/pom.xml |
-# * python/setup.py |
+# * Protobuf.podspec |
+# * csharp/Google.Protobuf.Tools.nuspec |
+# * csharp/src/*/AssemblyInfo.cs |
+# * csharp/src/Google.Protobuf/Google.Protobuf.nuspec |
+# * java/*/pom.xml |
+# * python/google/protobuf/__init__.py |
+# * protoc-artifacts/pom.xml |
# * src/google/protobuf/stubs/common.h |
# * src/Makefile.am (Update -version-info for LDFLAGS if needed) |
# |
# In the SVN trunk, the version should always be the next anticipated release |
# version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed |
# the size of one file name in the dist tarfile over the 99-char limit.) |
-AC_INIT([Protocol Buffers],[3.0.0-beta-3],[protobuf@googlegroups.com],[protobuf]) |
+AC_INIT([Protocol Buffers],[3.1.0],[protobuf@googlegroups.com],[protobuf]) |
AM_MAINTAINER_MODE([enable]) |
@@ -26,7 +31,7 @@ AC_CONFIG_MACRO_DIR([m4]) |
AC_ARG_VAR(DIST_LANG, [language to include in the distribution package (i.e., make dist)]) |
case "$DIST_LANG" in |
"") DIST_LANG=all ;; |
- all | cpp | csharp | java | python | javanano | objectivec | ruby | js) ;; |
+ all | cpp | csharp | java | python | javanano | objectivec | ruby | js | php) ;; |
*) AC_MSG_FAILURE([unknown language: $DIST_LANG]) ;; |
esac |
AC_SUBST(DIST_LANG) |
@@ -173,6 +178,8 @@ case "$target_os" in |
esac |
AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1]) |
+AX_CXX_COMPILE_STDCXX([11], [noext], [optional]) |
+ |
# HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, |
# since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock |
# too. |