m4/gst-error.m4: Use no%E_MACRO_REDEFINED on Solaris to prevent compiler warnings.

Original commit message from CVS:
Patch by:
Tim Mooney <mooney at dogbert dot cc dot ndsu dot nodak dot edu>
* m4/gst-error.m4:
Use no%E_MACRO_REDEFINED on Solaris to prevent compiler warnings.
Fixes bug #515905.

diff --git a/ChangeLog b/ChangeLog
index a06095e..883380c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-12  Sebastian Dröge  <slomo@circular-chaos.org>
+
+       Patch by:
+         Tim Mooney <mooney at dogbert dot cc dot ndsu dot nodak dot edu>
+
+       * m4/gst-error.m4:
+       Use no%E_MACRO_REDEFINED on Solaris to prevent compiler warnings.
+       Fixes bug #515905.
+
 2008-02-11  Sebastian Dröge  <slomo@circular-chaos.org>
 
        * gst.supp:

diff --git a/m4/gst-error.m4 b/m4/gst-error.m4
index d10cdc8..ad0622b 100644 (file)
--- a/m4/gst-error.m4
+++ b/m4/gst-error.m4
@@ -35,11 +35,12 @@ AC_DEFUN([AG_GST_SET_ERROR_CFLAGS],
     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"