generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  configure: Support preprocessor macros as header names

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-01-05 13:29:34 +01:00
parent f5f6e59495 52ccc4a0ec
commit 05286b6a9c
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
configure vendored
View File

@@ -845,6 +845,13 @@ check_ld(){
check_cmd $ld $LDFLAGS $flags $(ld_o $TMPE) $TMPO $libs $extralibs check_cmd $ld $LDFLAGS $flags $(ld_o $TMPE) $TMPO $libs $extralibs
} }
print_include(){
hdr=$1
test "${hdr%.h}" = "${hdr}" &&
echo "#include $hdr" ||
echo "#include <$hdr>"
}
check_code(){ check_code(){
log check_code "$@" log check_code "$@"
check=$1 check=$1
@@ -853,7 +860,7 @@ check_code(){
shift 3 shift 3
{ {
for hdr in $headers; do for hdr in $headers; do
echo "#include <$hdr>" print_include $hdr
done done
echo "int main(void) { $code; return 0; }" echo "int main(void) { $code; return 0; }"
} | check_$check "$@" } | check_$check "$@"
@@ -956,7 +963,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; }"