# HG changeset patch
# User Chris Cannam
# Date 1403078192 -3600
# Node ID c65dde5537bd64c3ba2628352e209b519939aaa7
# Parent  c98731517def261bbbfb72be46c1c07bb235341a
Merge from branch tony_integration

diff -r c98731517def -r c65dde5537bd .hgsubstate
--- a/.hgsubstate	Tue Jun 17 17:00:33 2014 +0100
+++ b/.hgsubstate	Wed Jun 18 08:56:32 2014 +0100
@@ -1,5 +1,5 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 3c5adc4a864fa75e5b1e67c260b77541aaa4f1f6 sv-dependency-builds
-1e4fa2007e61769ed28edf19316e801359c50cc7 svapp
-e06f03013f4647c512b7b4795d375e67f3168d7d svcore
-e4773943c9c179a4b29ced5b53f3ea21dbd0c739 svgui
+f1cab64363d7e4f18a461caee2e2eb1b4b5dfc77 svapp
+d03b3d95635863c6909efcabe63e49f0a97499c4 svcore
+40c6c9344ff6af5642ceaf288b1e07afa0e9b23d svgui
diff -r c98731517def -r c65dde5537bd configure
--- a/configure	Tue Jun 17 17:00:33 2014 +0100
+++ b/configure	Wed Jun 18 08:56:32 2014 +0100
@@ -4223,7 +4223,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 c98731517def -r c65dde5537bd configure.ac
--- a/configure.ac	Tue Jun 17 17:00:33 2014 +0100
+++ b/configure.ac	Wed Jun 18 08:56:32 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