[FFmpeg-cvslog] configure: Add workaround for qtkit detection using ICC compiler.

Thilo Borgmann git at videolan.org
Sun Apr 6 16:02:09 CEST 2014


ffmpeg | branch: master | Thilo Borgmann <thilo.borgmann at mail.de> | Sun Apr  6 14:57:24 2014 +0200| [33462542cf47506933753d4fa070ccd133ffcbfd] | committer: Michael Niedermayer

configure: Add workaround for qtkit detection using ICC compiler.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=33462542cf47506933753d4fa070ccd133ffcbfd
---

 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index c47fcd2..f47c39f 100755
--- a/configure
+++ b/configure
@@ -4668,7 +4668,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_oc QTKit/QTKit.h || disable qtkit_indev; }
+enabled qtkit_indev      && { { check_header QTKit/QTKit.h && 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