diff --git a/appveyor.yml b/appveyor.yml index 6c34d4b8f..02365f11b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -31,8 +31,8 @@ init: # Install needed build dependencies # install: - - '%CYG_ROOT%\setup-x86_64.exe --quiet-mode --no-shortcuts --upgrade-also --packages autoconf,autogen,automake,cygwin-devel,git,gcc-core,gcc-g++,libncurses-devel,libprotobuf-devel,make,openssh,openssl-devel,perl,perl_pods,pkg-config,tmux,zlib-devel' - - '%CYG_ROOT%\bin\cygcheck -dc cygwin' + - '%CYG_ROOT%\setup-x86_64.exe --quiet-mode --no-shortcuts --upgrade-also --packages autoconf,autogen,automake,cygwin-devel,git,gcc-core,gcc-g++,libncurses-devel,libprotobuf-devel,libssl-devel,make,openssh,perl,perl_pods,pkg-config,tmux,zlib-devel' + - '%CYG_ROOT%\bin\cygcheck -dc' # # Mosh uses symlinks and other Unixisms in the work dir. Fix by replacing it with a Cygwin checkout. diff --git a/configure.ac b/configure.ac index fba7ad742..8f9273d61 100644 --- a/configure.ac +++ b/configure.ac @@ -20,8 +20,9 @@ AS_IF([test x"$PROTOC" = x], # automake 1.12 seems to require this, but automake 1.11 doesn't recognize it m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) +# Protobuf 3.6+ requires C++11. AS_IF([pkg-config --atleast-version 3.6.0 protobuf], - [AX_CXX_COMPILE_STDCXX([11], [noext])]) + [AX_CXX_COMPILE_STDCXX([11])]) WARNING_CXXFLAGS="" PICKY_CXXFLAGS=""