Merge commit '7a76c6c4df31d1ff65464ccf3171acd57ef004eb'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 19:38:08 +0000 (20:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 19:38:08 +0000 (20:38 +0100)
* commit '7a76c6c4df31d1ff65464ccf3171acd57ef004eb':
  configure: Enable colored output for gcc 4.9+

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
+++ b/configure
@@@ -5324,8 -4483,10 +5324,9 @@@ elif enabled gcc; the
      check_cflags -Werror=implicit-function-declaration
      check_cflags -Werror=missing-prototypes
      check_cflags -Werror=return-type
 -    check_cflags -Werror=declaration-after-statement
      check_cflags -Werror=vla
 -    check_cflags -Werror=format-security
 +    check_cflags -Wformat
+     check_cflags -fdiagnostics-color=auto
      enabled extra_warnings || check_disable_warning -Wno-maybe-uninitialized
  elif enabled llvm_gcc; then
      check_cflags -mllvm -stack-alignment=16