aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorAdam Cozzette <acozzette@google.com>2018-05-31 10:07:28 -0700
committerAdam Cozzette <acozzette@google.com>2018-05-31 10:07:28 -0700
commit39d2f703b8c9ea58163e38f711a0c6c2d6b49c7c (patch)
tree81aaf41a7e97c9c5baa08adb578d4cf88dc43636 /configure.ac
parenta239ed2bda4b246c10c9d0d2a11a1f7bb1f52c86 (diff)
downloadprotobuf-39d2f703b8c9ea58163e38f711a0c6c2d6b49c7c.tar.gz
protobuf-39d2f703b8c9ea58163e38f711a0c6c2d6b49c7c.tar.bz2
protobuf-39d2f703b8c9ea58163e38f711a0c6c2d6b49c7c.zip
Require C++11 and pass -std=c++11
This commit updates the Autotools build to require a C++11 compiler and explicitly pass -std=c++11. This seems to be necessary for enabling C++11 support in older compilers.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 08f98d3b..aec10cfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,7 +88,7 @@ AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"],[
# Protocol Buffers contains several checks that are intended to be used only
# for debugging and which might hurt performance. Most users are probably
# end users who don't want these checks, so add -DNDEBUG by default.
- CXXFLAGS="$CXXFLAGS -DNDEBUG"
+ CXXFLAGS="$CXXFLAGS -std=c++11 -DNDEBUG"
AC_MSG_RESULT([use default: $PROTOBUF_OPT_FLAG $CXXFLAGS])
],[
@@ -207,7 +207,7 @@ case "$target_os" in
esac
AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1])
-AX_CXX_COMPILE_STDCXX([11], [noext], [optional])
+AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
# 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