From: <tp...@ke...> - 2008-02-23 12:19:00
|
CVS Root: /cvs/gstreamer Module: common Changes by: tpm Date: Sat Feb 23 2008 12:19:05 UTC Log message: * m4/gst-error.m4: Reflow checks for additional warning flags so they're not nested, which fixes the result reporting in the configure output. Modified files: . : ChangeLog m4 : gst-error.m4 Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/ChangeLog.diff?r1=1.200&r2=1.201 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/m4/gst-error.m4.diff?r1=1.10&r2=1.11 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/common/ChangeLog,v retrieving revision 1.200 retrieving revision 1.201 diff -u -d -r1.200 -r1.201 --- ChangeLog 22 Feb 2008 11:22:56 -0000 1.200 +++ ChangeLog 23 Feb 2008 12:18:51 -0000 1.201 @@ -1,3 +1,10 @@ +2008-02-23 Tim-Philipp Müller <tim at centricular dot net> + + * m4/gst-error.m4: + Reflow checks for additional warning flags so they're not + nested, which fixes the result reporting in the configure + output. 2008-02-22 Tim-Philipp Müller <tim at centricular dot net> * m4/as-compiler-flag.m4: Index: gst-error.m4 RCS file: /cvs/gstreamer/common/m4/gst-error.m4,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- gst-error.m4 22 Feb 2008 11:22:58 -0000 1.10 +++ gst-error.m4 23 Feb 2008 12:18:51 -0000 1.11 @@ -87,7 +87,9 @@ dnl if asked for, add -Werror if supported if test "x$1" != "xno" then - AS_CXX_COMPILER_FLAG([-Werror], [ + AS_CXX_COMPILER_FLAG(-Werror, werror_supported=yes, werror_supported=no) + if test "x$werror_supported" = "xyes"; then ERROR_CXXFLAGS="$ERROR_CXXFLAGS -Werror" dnl add exceptions @@ -95,30 +97,31 @@ do AS_CXX_COMPILER_FLAG([$f], ERROR_CXXFLAGS="$ERROR_CXXFLAGS $f") done - ], [ + else dnl if -Werror isn't suported, try -errwarn=%all - AS_CXX_COMPILER_FLAG([-errwarn=%all], [ - ERROR_CXXFLAGS="-errwarn=%all" - dnl try -errwarn=%all,no%E_EMPTY_DECLARATION, - dnl no%E_STATEMENT_NOT_REACHED,no%E_ARGUEMENT_MISMATCH, - dnl 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 - dnl "macro redefined" because of gst/gettext.h - dnl FIXME: is it really supposed to be 'ARGUEMENT' and not 'ARGUMENT'? - dnl FIXME: do any of these work with the c++ compiler? if not, why - dnl do we check at all? - for f in 'no%E_EMPTY_DECLARATION' \ - 'no%E_STATEMENT_NOT_REACHED' \ - 'no%E_ARGUEMENT_MISMATCH' \ - 'no%E_MACRO_REDEFINED' - do - AS_CXX_COMPILER_FLAG([-errwarn=%all,$f], [ - ERROR_CXXFLAGS="$ERROR_CXXFLAGS,$f" - ]) - done - ]) - ]) + AS_CXX_COMPILER_FLAG([-errwarn=%all], errwarnall=yes, errwarnall=no) + if test "x$errwarnall" = "xyes"; then + ERROR_CXXFLAGS="-errwarn=%all" + dnl try -errwarn=%all,no%E_EMPTY_DECLARATION, + dnl no%E_STATEMENT_NOT_REACHED,no%E_ARGUEMENT_MISMATCH, + dnl 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 + dnl "macro redefined" because of gst/gettext.h + dnl FIXME: is it really supposed to be 'ARGUEMENT' and not 'ARGUMENT'? + dnl FIXME: do any of these work with the c++ compiler? if not, why + dnl do we check at all? + for f in 'no%E_EMPTY_DECLARATION' \ + 'no%E_STATEMENT_NOT_REACHED' \ + 'no%E_ARGUEMENT_MISMATCH' \ + 'no%E_MACRO_REDEFINED' + do + AS_CXX_COMPILER_FLAG([-errwarn=%all,$f], [ + ERROR_CXXFLAGS="$ERROR_CXXFLAGS,$f" + ]) + done + fi + fi fi AC_SUBST(ERROR_CXXFLAGS) |