Module: libav Branch: release/0.8 Commit: 7b00340f97f2d9456a0e6d6cee4c1a92165cde91
Author: Diego Biurrun <[email protected]> Committer: Luca Barbato <[email protected]> Date: Mon Dec 23 01:03:48 2013 +0100 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 <[email protected]> (cherry picked from commit 52ccc4a0ece88030e67254418317d72089a0ecc8) Signed-off-by: Luca Barbato <[email protected]> Conflicts: configure --- configure | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 844069b..f9eac08 100755 --- a/configure +++ b/configure @@ -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; }" _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
