diff options
author | Diego Biurrun <diego@biurrun.de> | 2013-12-23 01:03:48 +0100 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2014-03-13 12:46:10 +0100 |
commit | 7b00340f97f2d9456a0e6d6cee4c1a92165cde91 (patch) | |
tree | 1434e14fc6885756bd591535fb1d42bdbbfcbd2c | |
parent | 0120e480bf0a1257299c8c84416a8814ccfcc73b (diff) | |
download | ffmpeg-7b00340f97f2d9456a0e6d6cee4c1a92165cde91.tar.gz |
configure: Support preprocessor macros as header names
New versions of FreeType have moved the location of their API
header(s) and hide the location behind a macro.
Since the location changes between versions and no other way
to know the location exists, this workaround becomes necessary.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 52ccc4a0ece88030e67254418317d72089a0ecc8)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Conflicts:
configure
-rwxr-xr-x | configure | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -654,6 +654,13 @@ check_ld(){ 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(){ log check_cppflags "$@" set -- $($filter_cppflags "$@") @@ -723,7 +730,7 @@ check_func_headers(){ shift 2 { for hdr in $headers; do - echo "#include <$hdr>" + print_include $hdr done for func in $funcs; do echo "long check_$func(void) { return (long) $func; }" |