Unverified Commit 4176920e authored by Robert Edmonds's avatar Robert Edmonds Committed by GitHub

Merge pull request #334 from protobuf-c/edmonds/ax_cxx_compile_stdcxx

Use AX_CXX_COMPILE_STDCXX macro to enable C++11 support in old compilers
parents f3102ed2 defc6f04
...@@ -13,7 +13,6 @@ addons: ...@@ -13,7 +13,6 @@ addons:
env: env:
global: global:
- CXX="g++ -std=c++11"
- PROTOBUF_VERSION=3.6.1 - PROTOBUF_VERSION=3.6.1
- PKG_CONFIG_PATH=$HOME/protobuf-$PROTOBUF_VERSION-bin/lib/pkgconfig - PKG_CONFIG_PATH=$HOME/protobuf-$PROTOBUF_VERSION-bin/lib/pkgconfig
......
...@@ -76,6 +76,8 @@ AC_ARG_ENABLE([protoc], ...@@ -76,6 +76,8 @@ AC_ARG_ENABLE([protoc],
if test "x$enable_protoc" != "xno"; then if test "x$enable_protoc" != "xno"; then
AC_LANG_PUSH([C++]) AC_LANG_PUSH([C++])
AX_CXX_COMPILE_STDCXX(11, noext, mandatory)
PKG_CHECK_MODULES([protobuf], [protobuf >= 3.0.0], PKG_CHECK_MODULES([protobuf], [protobuf >= 3.0.0],
[proto3_supported=yes], [proto3_supported=yes],
[PKG_CHECK_MODULES([protobuf], [protobuf >= 2.6.0])] [PKG_CHECK_MODULES([protobuf], [protobuf >= 2.6.0])]
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment