From 5e15aa74c65892335e6533d6ee86cc07588e5a17 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Wed, 25 Apr 2012 15:16:51 +0100
Subject: Disable -Waggregate-return if building with SLIRP

The API design of SLIRP means that it is not practical to use
the -Waggregate-return warning flag. Disable this flag in the
(unlikely) scenario where SLIRP is actually requested at build
time
---
 m4/spice-compile-warnings.m4 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/m4/spice-compile-warnings.m4 b/m4/spice-compile-warnings.m4
index 8de2ffd0..601ecf8c 100644
--- a/m4/spice-compile-warnings.m4
+++ b/m4/spice-compile-warnings.m4
@@ -148,7 +148,10 @@ AC_DEFUN([SPICE_COMPILE_WARNINGS],[
     AC_SUBST([WARN_CXXFLAGS])
 
     # These are C-only warnings
-    gl_WARN_ADD([-Waggregate-return])
+    if test "x$enable_tunnel" != "xyes"; then
+        # Slirp causes pain :-(
+        gl_WARN_ADD([-Waggregate-return])
+    fi
     gl_WARN_ADD([-Wstrict-prototypes])
     gl_WARN_ADD([-Wold-style-definition])
     gl_WARN_ADD([-Wnested-externs])
-- 
cgit