[FFmpeg-cvslog] configure: Check for generated output in check_header_oc.

Thilo Borgmann git at videolan.org
Mon Apr 7 05:22:17 CEST 2014


ffmpeg | branch: master | Thilo Borgmann <thilo.borgmann at mail.de> | Sun Apr  6 23:17:08 2014 +0200| [fdaf8372c27e591881c5fbc869e5dc9e87b9ec89] | committer: Michael Niedermayer

configure: Check for generated output in check_header_oc.

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

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

 configure |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 80e36c1..e09f319 100755
--- a/configure
+++ b/configure
@@ -776,6 +776,11 @@ check_cmd(){
     "$@" >> $logfile 2>&1
 }
 
+check_stat(){
+    log check_stat "$@"
+    stat "$1" >> $logfile 2>&1
+}
+
 cc_o(){
     eval printf '%s\\n' $CC_O
 }
@@ -952,13 +957,14 @@ EOF
 
 check_header_oc(){
     log check_header_oc "$@"
+    rm -f -- "$TMPO"
     header=$1
     shift
     disable_safe $header
     {
        echo "#include <$header>"
        echo "int main(void) { return 0; }"
-    } | check_oc "$@" && enable_safe $headers
+    } | check_oc && check_stat "$TMPO" && enable_safe $headers
 }
 
 check_func(){
@@ -4671,7 +4677,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 && check_header_oc 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