[tor-commits] [stegotorus/master] Don't *insist* on C++11 support from the compiler.

[zwol at torproject.org]

commit ae3a7df0ffe51b248384f3c7d785d05be4778ac4
Author: Zack Weinberg <zackw at cmu.edu>
Date:   Tue Mar 27 21:29:23 2012 -0700

    Don't *insist* on C++11 support from the compiler.
---
 Makefile.am              |    4 +---
 m4/cxxflags_stdcxx_11.m4 |    3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 978c180..377e37f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,9 +4,7 @@
 
 ACLOCAL_AMFLAGS = -I m4 --install
 
-WARNINGS    = -Werror -Wall -Wextra -Wformat=2
-
-AM_CXXFLAGS = -std=c++98 $(WARNINGS)
+AM_CXXFLAGS = -Werror -Wall -Wextra -Wformat=2
 AM_CPPFLAGS = -I. -I$(srcdir)/src -D_FORTIFY_SOURCE=2 $(lib_CPPFLAGS)
 LDADD       = libstegotorus.a
 
diff --git a/m4/cxxflags_stdcxx_11.m4 b/m4/cxxflags_stdcxx_11.m4
index 1c5c0f2..383b708 100644
--- a/m4/cxxflags_stdcxx_11.m4
+++ b/m4/cxxflags_stdcxx_11.m4
@@ -10,7 +10,6 @@
 #
 #   Check for baseline language coverage in the compiler for the C++11
 #   standard; if necessary, add switches to CXXFLAGS to enable support.
-#   Errors out if no mode that supports C++11 baseline syntax can be found.
 #   The argument, if specified, indicates whether you insist on an extended
 #   mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. -std=c++11).
 #   If neither is specified, you get whatever works, with preference for an
@@ -102,6 +101,6 @@ AC_DEFUN([AX_CXXFLAGS_STDCXX_11], [dnl
   fi])
 
   if test x$ac_success = xno; then
-    AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
+    AC_MSG_WARN([*** Compiler support for C++11 language features not detected.])
   fi
 ])