OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1cb3ca2
2a7ab2d
)
Merge remote-tracking branch 'qatar/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 5 Mar 2013 11:37:15 +0000
(12:37 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 5 Mar 2013 11:37:15 +0000
(12:37 +0100)
* qatar/master:
configure: Use check_builtin() where appropriate
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1
2
configure
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
configure
index
0c751b9
,
7525e22
..
2e7344c
---
1
/
configure
---
2
/
configure
+++ b/
configure
@@@
-1041,7
-944,7
+1041,7
@@@
check_builtin()
builtin=$3
shift 3
disable "$name"
-- check_code ld "$headers" "$builtin" "$@" && enable "$name"
++ check_code ld "$headers" "$builtin" "
cc" "
$@" && enable "$name"
}
require(){