# HG changeset patch
# User Chris Cannam
# Date 1403112648 -3600
# Node ID f82dece35d213e4eb2f1835825fea803f46fd5f0
# Parent  c4ef666721bf7c5f1174e700736e1a84dea8a224# Parent  b68af2be4545adf04eec58c50d8419dc574b8642
Merge from branch tonioni (the two are currently in sync)

diff -r c4ef666721bf -r f82dece35d21 configure
--- a/configure	Wed Jun 18 13:51:27 2014 +0100
+++ b/configure	Wed Jun 18 18:30:48 2014 +0100
@@ -4202,7 +4202,7 @@
 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
 
 if test "x$GCC" = "xyes"; then
-        CXXFLAGS_DEBUG="-Wall -Woverloaded-virtual -Wextra -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -g -pipe"
+        CXXFLAGS_DEBUG="-Wall -Wextra -Werror -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -g -pipe"
    	CXXFLAGS_RELEASE="-g0 -O2 -Wall -pipe"
    	CXXFLAGS_MINIMAL="-g0 -O0"
 fi
diff -r c4ef666721bf -r f82dece35d21 configure.ac
--- a/configure.ac	Wed Jun 18 13:51:27 2014 +0100
+++ b/configure.ac	Wed Jun 18 18:30:48 2014 +0100
@@ -50,7 +50,7 @@
 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
 
 if test "x$GCC" = "xyes"; then
-        CXXFLAGS_DEBUG="-Wall -Woverloaded-virtual -Wextra -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -g -pipe"
+        CXXFLAGS_DEBUG="-Wall -Wextra -Werror -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -g -pipe"
    	CXXFLAGS_RELEASE="-g0 -O2 -Wall -pipe"
    	CXXFLAGS_MINIMAL="-g0 -O0"
 fi