[FFmpeg-cvslog] configure: use TMPM in check_header_oc
Michael Niedermayer
git at videolan.org
Sat Apr 5 13:48:39 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 5 13:30:27 2014 +0200| [3c728ceec66d4e26a3edbf136a459c271c8452cd] | committer: Michael Niedermayer
configure: use TMPM in check_header_oc
Some compilers when given -x objective-c will tell that they dont support
that but return success. Using a .m file instead returns proper failure in
that case
This should fix a build failure on freebsd
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c728ceec66d4e26a3edbf136a459c271c8452cd
---
configure | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 5ca69c4..c47fcd2 100755
--- a/configure
+++ b/configure
@@ -798,6 +798,13 @@ check_cxx(){
check_cmd $cxx $CPPFLAGS $CFLAGS $CXXFLAGS "$@" $CXX_C -o $TMPO $TMPCPP
}
+check_oc(){
+ log check_oc "$@"
+ cat > $TMPM
+ log_file $TMPM
+ check_cmd $cc $CPPFLAGS $CFLAGS "$@" $CC_C $(cc_o $TMPO) $TMPM
+}
+
check_cpp(){
log check_cpp "$@"
cat > $TMPC
@@ -951,7 +958,7 @@ check_header_oc(){
{
echo "#include <$header>"
echo "int main(void) { return 0; }"
- } | check_cc "-x" "objective-c" "$@" && enable_safe $headers
+ } | check_oc "$@" && enable_safe $headers
}
check_func(){
@@ -2977,6 +2984,7 @@ tmpfile TMPC .c
tmpfile TMPCPP .cpp
tmpfile TMPE $EXESUF
tmpfile TMPH .h
+tmpfile TMPM .m
tmpfile TMPO .o
tmpfile TMPS .S
tmpfile TMPSH .sh
More information about the ffmpeg-cvslog
mailing list