Commit 62d5b5a9 authored by Diego Biurrun's avatar Diego Biurrun

configure: Extend check_header() to allow checking for multiple headers

Also use that new capability to simplify bktr header checks.
parent b4690091
...@@ -929,13 +929,15 @@ check_stripflags(){ ...@@ -929,13 +929,15 @@ check_stripflags(){
check_header(){ check_header(){
log check_header "$@" log check_header "$@"
header=$1 headers=$1
shift shift
disable_sanitized $header disable_sanitized $headers
check_cpp "$@" <<EOF && enable_sanitized $header {
#include <$header> for hdr in $headers; do
int x; print_include $hdr
EOF done
echo "int x;"
} | check_cpp "$@" && enable_sanitized $headers
} }
check_func(){ check_func(){
...@@ -1128,9 +1130,9 @@ require(){ ...@@ -1128,9 +1130,9 @@ require(){
require_header(){ require_header(){
log require "$@" log require "$@"
header="$1" headers="$1"
shift shift
check_header "$header" "$@" || die "ERROR: $header not found" check_header "$headers" "$@" || die "ERROR: $headers not found"
} }
require_cpp_condition(){ require_cpp_condition(){
...@@ -4780,13 +4782,10 @@ check_lib vfw32 "windows.h vfw.h" capCreateCaptureWindow -lvfw32 ...@@ -4780,13 +4782,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_cpp_condition vfw.h "WM_CAP_DRIVER_CONNECT > WM_USER" && enable vfwcap_defines
# check for ioctl_meteor.h, ioctl_bt848.h and alternatives # check for ioctl_meteor.h, ioctl_bt848.h and alternatives
{ check_header dev/bktr/ioctl_meteor.h && check_header "dev/bktr/ioctl_meteor.h dev/bktr/ioctl_bt848.h" ||
check_header dev/bktr/ioctl_bt848.h; } || check_header "machine/ioctl_meteor.h machine/ioctl_bt848.h" ||
{ check_header machine/ioctl_meteor.h && check_header "dev/video/meteor/ioctl_meteor.h dev/video/bktr/ioctl_bt848.h" ||
check_header machine/ioctl_bt848.h; } || check_header "dev/ic/bt8xx.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 sys/soundcard.h check_header sys/soundcard.h
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment