[FFmpeg-cvslog] configure: Fix testing of objective-c headers for qtkit
Michael Niedermayer
git at videolan.org
Sat Apr 5 02:11:22 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 5 02:03:15 2014 +0200| [a2c6a99ba56a8c4c4b5efb7474002de10e67bb06] | committer: Michael Niedermayer
configure: Fix testing of objective-c headers for qtkit
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2c6a99ba56a8c4c4b5efb7474002de10e67bb06
---
configure | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 28b7246..1098fe6 100755
--- a/configure
+++ b/configure
@@ -943,6 +943,16 @@ int x;
EOF
}
+check_header_oc(){
+ log check_header_oc "$@"
+ header=$1
+ shift
+ {
+ echo "#include <$header>"
+ echo "int main(void) { return 0; }"
+ } | check_cc "-x" "objective-c" "$@" && enable_safe $headers
+}
+
check_func(){
log check_func "$@"
func=$1
@@ -4649,7 +4659,7 @@ enabled openssl && { check_lib openssl/ssl.h SSL_library_init -lssl -l
check_lib openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
die "ERROR: openssl not found"; }
-enabled qtkit_indev && { check_header QTKit/QTKit.h || disable qtkit_indev; }
+enabled qtkit_indev && { check_header_oc QTKit/QTKit.h || disable qtkit_indev; }
if enabled gnutls; then
{ check_lib nettle/bignum.h nettle_mpz_get_str_256 -lnettle -lhogweed -lgmp && enable nettle; } ||
More information about the ffmpeg-cvslog
mailing list