Merge commit 'ec772cca60423b9994fe00c7cef239f93eae6112' into release/0.10

* commit 'ec772cca60423b9994fe00c7cef239f93eae6112':
  drawtext: Drop pointless header
  configure: Support preprocessor macros as header names

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-03 00:54:33 +02:00
commit e771425e98
2 changed files with 8 additions and 2 deletions

9
configure vendored
View File

@ -688,6 +688,13 @@ check_ld(){
check_cmd $ld $LDFLAGS $flags -o $TMPE $TMPO $libs $extralibs check_cmd $ld $LDFLAGS $flags -o $TMPE $TMPO $libs $extralibs
} }
print_include(){
hdr=$1
test "${hdr%.h}" = "${hdr}" &&
echo "#include $hdr" ||
echo "#include <$hdr>"
}
check_cppflags(){ check_cppflags(){
log check_cppflags "$@" log check_cppflags "$@"
set -- $($filter_cppflags "$@") set -- $($filter_cppflags "$@")
@ -765,7 +772,7 @@ check_func_headers(){
shift 2 shift 2
{ {
for hdr in $headers; do for hdr in $headers; do
echo "#include <$hdr>" print_include $hdr
done done
for func in $funcs; do for func in $funcs; do
echo "long check_$func(void) { return (long) $func; }" echo "long check_$func(void) { return (long) $func; }"

View File

@ -47,7 +47,6 @@
#undef time #undef time
#include <ft2build.h> #include <ft2build.h>
#include <freetype/config/ftheader.h>
#include FT_FREETYPE_H #include FT_FREETYPE_H
#include FT_GLYPH_H #include FT_GLYPH_H