# HG changeset patch
# User Chris Cannam
# Date 1404286965 -3600
# Node ID db31266cf60662d7f55120d05861e51236bd6ae6
# Parent  f82dece35d213e4eb2f1835825fea803f46fd5f0# Parent  6c52314b31b024777e09ad0e6bc0d329bd87c8e8
Merge

diff -r 6c52314b31b0 -r db31266cf606 configure
--- a/configure	Tue Jul 01 15:32:54 2014 +0100
+++ b/configure	Wed Jul 02 08:42:45 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 6c52314b31b0 -r db31266cf606 configure.ac
--- a/configure.ac	Tue Jul 01 15:32:54 2014 +0100
+++ b/configure.ac	Wed Jul 02 08:42:45 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