From 5d7c9cc163b211f5f3a9b8663e055c03bdacb343 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Sat, 21 Feb 2009 18:17:11 +0100
Subject: [PATCH] Only add -fno-strict-aliasing to ERROR_CXXFLAGS with older
 GLib versions

---
 m4/gst-error.m4 | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/m4/gst-error.m4 b/m4/gst-error.m4
index 50a964d..6c7b3eb 100644
--- a/m4/gst-error.m4
+++ b/m4/gst-error.m4
@@ -114,10 +114,15 @@ AC_DEFUN([AG_GST_SET_ERROR_CXXFLAGS],
         ERROR_CXXFLAGS="$ERROR_CXXFLAGS -Werror"
 
         dnl add exceptions
-        for f in '-Wno-non-virtual-dtor' '-fno-strict-aliasing'
-        do
-          AS_CXX_COMPILER_FLAG([$f], ERROR_CXXFLAGS="$ERROR_CXXFLAGS $f")
-        done
+        AS_CXX_COMPILER_FLAG([-Wno-non-virtual-dtor], ERROR_CXXFLAGS="$ERROR_CXXFLAGS -Wno-non-virtual-dtor")
+	
+	dnl Add -fno-strict-aliasing for GLib versions before 2.19.8
+	dnl as before G_LOCK and friends caused strict aliasing compiler
+	dnl warnings.
+	PKG_CHECK_EXISTS([glib-2.0 < 2.19.8], [
+	  AS_CXX_COMPILER_FLAG([-fno-strict-aliasing],
+	    ERROR_CXXFLAGS="$ERROR_CXXFLAGS -fno-strict-aliasing")
+	  ])
     else
       dnl if -Werror isn't suported, try -errwarn=%all
       AS_CXX_COMPILER_FLAG([-errwarn=%all], errwarnall=yes, errwarnall=no)
-- 
2.34.1