Merge commit '404cb74793284aa03e2e1a7e911c980c4cba0e9e'
authorJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 20:01:01 +0000 (17:01 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 20:01:01 +0000 (17:01 -0300)
* commit '404cb74793284aa03e2e1a7e911c980c4cba0e9e':
  configure: Pass CFLAGS_HEADERS through the right CFLAGS filter

Merged-by: James Almer <jamrial@gmail.com>
1  2 
configure

diff --cc 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