diff options
| author | Thilo Borgmann <thilo.borgmann@mail.de> | 2014-04-06 23:17:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-07 05:11:47 +0200 |
| commit | fdaf8372c27e591881c5fbc869e5dc9e87b9ec89 (patch) | |
| tree | 83d43899bead75159012ed914e11289ec8068251 | |
| parent | a75ba1e116a4559ef842218c22288c8c2011f748 (diff) | |
| download | ffmpeg-fdaf8372c27e591881c5fbc869e5dc9e87b9ec89.tar.gz | |
configure: Check for generated output in check_header_oc.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -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; } || |