Index: common/m4/gst-error.m4
===================================================================
RCS file: /cvs/gstreamer/common/m4/gst-error.m4,v
retrieving revision 1.8
diff -u -r1.8 gst-error.m4
--- common/m4/gst-error.m4	12 Jan 2008 18:05:43 -0000	1.8
+++ common/m4/gst-error.m4	9 Feb 2008 00:23:02 -0000
@@ -35,11 +35,12 @@
     dnl if -Werror isn't suported
     if test "x$ERROR_CFLAGS" == "x"
     then
-      dnl try -errwarn=%all,no%E_EMPTY_DECLARATION,no%E_STATEMENT_NOT_REACHED,no%E_ARGUEMENT_MISMATCH (Sun Forte case)
+      dnl try -errwarn=%all,no%E_EMPTY_DECLARATION,no%E_STATEMENT_NOT_REACHED,no%E_ARGUEMENT_MISMATCH,no%E_MACRO_REDEFINED (Sun Forte case)
       dnl For Forte we need disable "empty declaration" warning produced by un-needed semicolon 
       dnl "statement not reached" disabled because there is g_assert_not_reached () in some places
-      AS_COMPILER_FLAG([-errwarn=%all,no%E_EMPTY_DECLARATION,no%E_STATEMENT_NOT_REACHED,no%E_ARGUEMENT_MISMATCH],
-                       [ERROR_CFLAGS="-errwarn=%all,no%E_EMPTY_DECLARATION,no%E_STATEMENT_NOT_REACHED,no%E_ARGUEMENT_MISMATCH"])
+      dnl "macro redefined" because of gst/gettext.h
+      AS_COMPILER_FLAG([-errwarn=%all,no%E_EMPTY_DECLARATION,no%E_STATEMENT_NOT_REACHED,no%E_ARGUEMENT_MISMATCH,no%E_MACRO_REDEFINED],
+                       [ERROR_CFLAGS="-errwarn=%all,no%E_EMPTY_DECLARATION,no%E_STATEMENT_NOT_REACHED,no%E_ARGUEMENT_MISMATCH,no%E_MACRO_REDEFINED"])
 
       dnl if this also isn't suported, try only for -errwarn=%all
       if test "x$ERROR_CFLAGS" == "x"
