From: Rémi Denis-Courmont <remi@remlab.net>
Date: Wed, 7 Apr 2010 18:47:59 +0000 (+0300)
Subject: Remove the Werror stuff for good
X-Git-Tag: 1.1.0-pre1~104
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=56de5bf2d91b9559d7734b3fe75fbea1ff42d42e

Remove the Werror stuff for good

This is not portable across compilers and versions.
This belong in your own personal CFLAGS, not the build system.
---

diff --git a/configure.ac b/configure.ac
index 7fbd45e519..e21d62d404 100644
--- a/configure.ac
+++ b/configure.ac
@@ -971,16 +971,6 @@ CFLAGS="${CFLAGS_save}"
 RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var error-implicit-function-declaration])
 RDC_PROG_CC_FLAGS([-pipe])
 
-AC_ARG_ENABLE(warnings-as-error,
-      AS_HELP_STRING([--enable-warnings-as-error],[Treat acceptable warnings as error (default disabled)]),, [enable_warnings_as_error="no"])
-AS_IF([test "${enable_warnings_as_error}" = "yes"], [
-    RDC_PROG_CC_WERRORFLAGS([unused-function unused-label unused-value unused-parameter unused-variable unused \
-     missing-braces nonnull parentheses uninitialized address enum-compare undef comment switch \
-     bad-function-cast implicit sequence-point strict-aliasing array-bounds missing-parameter-type \
-     overflow int-to-pointer-cast pointer-to-int-cast div-by-zero overflow ignored])
-])
-AC_SUBST(CFLAGS_WERROR)
-
 dnl Check for various optimization flags
 AC_CACHE_CHECK([if \$CC accepts -Os],
     [ac_cv_c_os],
diff --git a/m4/flags.m4 b/m4/flags.m4
index 35f47c4b6c..2db4febba2 100644
--- a/m4/flags.m4
+++ b/m4/flags.m4
@@ -31,12 +31,6 @@ AC_DEFUN([RDC_PROG_CC_FLAGS],
   RDC_PROG_CC_FLAGS_IFELSE([$1], [CFLAGS="${CFLAGS} $1"])
 ])
 
-AC_DEFUN([RDC_PROG_CC_WERRORFLAGS],
-[ for a in $1; do
-    RDC_PROG_CC_FLAGS_IFELSE([-Werror=$a], [CFLAGS_WERROR="${CFLAGS_WERROR} -Werror=${a}"])
-  done
-])
-
 AC_DEFUN([RDC_PROG_CC_WFLAGS],
 [ for a in $1; do
     RDC_PROG_CC_FLAGS([-W$a])
diff --git a/m4/vlc.m4 b/m4/vlc.m4
index 1ae4ff5f88..32f028e3d5 100644
--- a/m4/vlc.m4
+++ b/m4/vlc.m4
@@ -60,13 +60,6 @@ AC_DEFUN([VLC_ADD_LIBS], [
   ])
 ])
 
-AC_DEFUN([VLC_SET_CFLAGS_WERROR], [
-  m4_foreach_w([element], [$1], [
-    [eval "CFLAGS_WERROR_]element[="'"'"$2"'"']
-    [am_modules_with_werror="${am_modules_with_werror} ]element["]
-  ])
-])
-
 dnl ===========================================================================
 dnl  Macros to save and restore default flags
 
@@ -95,7 +88,7 @@ AC_DEFUN([VLC_OUTPUT_VLC_CONFIG_IN], [
 
   AC_MSG_RESULT(configure: creating ./vlc-config.in)
 
-  am_all_modules="`for x in ${am_modules_with_cppflags} ${am_modules_with_cflags} ${am_modules_with_cxxflags} ${am_modules_with_objcflags} ${am_modules_with_ldflags} ${am_modules_with_libs} ${am_modules_with_werror}; do echo $x; done | sort | uniq`"
+  am_all_modules="`for x in ${am_modules_with_cppflags} ${am_modules_with_cflags} ${am_modules_with_cxxflags} ${am_modules_with_objcflags} ${am_modules_with_ldflags} ${am_modules_with_libs}; do echo $x; done | sort | uniq`"
 
   rm -f vlc-config.in
   sed -ne '/#@1@#/q;p' < "${srcdir}/vlc-config.in.in" \
@@ -140,9 +133,6 @@ AC_DEFUN([VLC_OUTPUT_VLC_CONFIG_IN], [
     if test "`eval echo @'$'LIBS_${x}@`" != "@@"; then
       echo "      libs=\"\${libs} `eval echo '$'LIBS_${x}`\""
     fi
-    if test "`eval echo @'$'CFLAGS_WERROR_${x}@`" != "@@"; then
-      echo "      cflags_werror=\"`eval echo '$'CFLAGS_WERROR_${x}`\""
-    fi
     echo "    ;;"
   ] done >> vlc-config.in
 
diff --git a/vlc-config.in.in b/vlc-config.in.in
index cebc26c354..e457e226a5 100644
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -26,8 +26,6 @@ cflags_optim_speed="@CFLAGS_OPTIM_SPEED@"
 cflags_optim_nodebug="@CFLAGS_OPTIM_NODEBUG@"
 cflags_nooptim="@CFLAGS_NOOPTIM@"
 
-cflags_werror="@CFLAGS_WERROR@"
-
 #
 #  Do not touch below this place unless you really know what you are doing
 #
@@ -213,10 +211,6 @@ while test $# -gt 0; do
       echo_builtin=yes
       cppflags="${cppflags} -D__LIBVLC__ -D__BUILTIN__"
       ;;
-    libs)
-      # Avoid to use werror on what is not vlc's code.
-      cflags_werror=""
-      ;;
     pic)
       ;;
     mozilla)
@@ -239,12 +233,6 @@ if test -n "${module}"; then
   cppflags="${cppflags} -DMODULE_NAME=${module} -DMODULE_NAME_IS_${module} -DMODULE_STRING=\"${module}\""
 fi
 
-#
-# Set the Werror flags.
-#
-
-cflags="${cflags} ${cflags_werror}"
-
 #
 #  Output what we were asked
 #