[FFmpeg-cvslog] Merge commit '404cb74793284aa03e2e1a7e911c980c4cba0e9e'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Apr 13 17:01:01 2017 -0300| [41b8b2ca286f4a4d21c2acaa52248ff33fa606c9] | committer: James Almer

Merge commit '404cb74793284aa03e2e1a7e911c980c4cba0e9e'

* commit '404cb74793284aa03e2e1a7e911c980c4cba0e9e':
  configure: Pass CFLAGS_HEADERS through the right CFLAGS filter

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=41b8b2ca286f4a4d21c2acaa52248ff33fa606c9
---

 configure | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index d13d60b96f..e8301c886e 100755
--- a/configure
+++ b/configure
@@ -828,6 +828,10 @@ add_cflags(){
     append CFLAGS $($cflags_filter "$@")
 }
 
+add_cflags_headers(){
+    append CFLAGS_HEADERS $($cflags_filter "$@")
+}
+
 add_cxxflags(){
     append CXXFLAGS $($cflags_filter "$@")
 }
@@ -6128,7 +6132,7 @@ check_disable_warning -Wno-unused-const-variable
 
 check_disable_warning_headers(){
     warning_flag=-W${1#-Wno-}
-    test_cflags $warning_flag && append cflags_headers $1
+    test_cflags $warning_flag && add_cflags_headers $1
 }
 
 check_disable_warning_headers -Wno-deprecated-declarations
@@ -6730,7 +6734,7 @@ TARGET_EXEC=$target_exec $target_exec_args
 TARGET_PATH=$target_path
 TARGET_SAMPLES=${target_samples:-\$(SAMPLES)}
 CFLAGS-ffplay=${sdl2_cflags}
-CFLAGS_HEADERS=$cflags_headers
+CFLAGS_HEADERS=$CFLAGS_HEADERS
 ZLIB=$($ldflags_filter -lz)
 LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
 EXTRALIBS=$extralibs


======================================================================

diff --cc configure
index d13d60b96f,4c11e5e033..e8301c886e
--- a/configure
+++ b/configure
@@@ -828,10 -716,10 +828,14 @@@ add_cflags()
      append CFLAGS $($cflags_filter "$@")
  }
  
+ add_cflags_headers(){
+     append CFLAGS_HEADERS $($cflags_filter "$@")
+ }
+ 
 +add_cxxflags(){
 +    append CXXFLAGS $($cflags_filter "$@")
 +}
 +
  add_asflags(){
      append ASFLAGS $($asflags_filter "$@")
  }
@@@ -6729,8 -5301,8 +6733,8 @@@ HOSTLD_O=$HOSTLD_
  TARGET_EXEC=$target_exec $target_exec_args
  TARGET_PATH=$target_path
  TARGET_SAMPLES=${target_samples:-\$(SAMPLES)}
 -CFLAGS-avplay=$sdl_cflags
 +CFLAGS-ffplay=${sdl2_cflags}
- CFLAGS_HEADERS=$cflags_headers
+ CFLAGS_HEADERS=$CFLAGS_HEADERS
  ZLIB=$($ldflags_filter -lz)
  LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
  EXTRALIBS=$extralibs