Also use that new capability to simplify bktr header checks.
---
configure | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/configure b/configure
index f30820e7d0..635bb42f3b 100755
--- a/configure
+++ b/configure
@@ -925,13 +925,15 @@ check_stripflags(){
check_header(){
log check_header "$@"
- header=$1
+ headers=$1
shift
- disable_sanitized $header
- check_cpp "$@" <<EOF && enable_sanitized $header
-#include <$header>
-int x;
-EOF
+ disable_sanitized $headers
+ {
+ for hdr in $headers; do
+ print_include $hdr
+ done
+ echo "int x;"
+ } | check_cpp "$@" && enable_sanitized $headers
}
check_func(){
@@ -4760,13 +4762,10 @@ check_lib vfw32 "windows.h vfw.h"
capCreateCaptureWindow -lvfw32
check_cpp_condition vfw.h "WM_CAP_DRIVER_CONNECT > WM_USER" && enable
vfwcap_defines
# check for ioctl_meteor.h, ioctl_bt848.h and alternatives
-{ check_header dev/bktr/ioctl_meteor.h &&
- check_header dev/bktr/ioctl_bt848.h; } ||
-{ check_header machine/ioctl_meteor.h &&
- check_header machine/ioctl_bt848.h; } ||
-{ check_header dev/video/meteor/ioctl_meteor.h &&
- check_header dev/video/bktr/ioctl_bt848.h; } ||
-check_header dev/ic/bt8xx.h
+check_header dev/bktr/ioctl_meteor.h dev/bktr/ioctl_bt848.h
||
+ check_header machine/ioctl_meteor.h machine/ioctl_bt848.h
||
+ check_header dev/video/meteor/ioctl_meteor.h dev/video/bktr/ioctl_bt848.h
||
+ check_header dev/ic/bt8xx.h
check_header sys/soundcard.h
--
2.11.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
