Commit 8c893aa3 authored by Diego Biurrun's avatar Diego Biurrun

configure: Drop unnecessary variables, shifts, and quotes in helper functions

parent 12131489
...@@ -816,7 +816,7 @@ EOF ...@@ -816,7 +816,7 @@ EOF
check_insn(){ check_insn(){
log check_insn "$@" log check_insn "$@"
check_inline_asm ${1}_inline "\"$2\"" check_inline_asm ${1}_inline "$2"
echo "$2" | check_as && enable ${1}_external || disable ${1}_external echo "$2" | check_as && enable ${1}_external || disable ${1}_external
} }
...@@ -1097,11 +1097,9 @@ check_struct(){ ...@@ -1097,11 +1097,9 @@ check_struct(){
check_builtin(){ check_builtin(){
log check_builtin "$@" log check_builtin "$@"
name=$1 name=$1
headers=$2 shift
builtin=$3
shift 3
disable "$name" disable "$name"
check_code ld "$headers" "$builtin" "$@" && enable "$name" check_code ld "$@" && enable "$name"
} }
check_compile_assert(){ check_compile_assert(){
...@@ -1118,25 +1116,20 @@ require(){ ...@@ -1118,25 +1116,20 @@ require(){
log require "$@" log require "$@"
name_version="$1" name_version="$1"
name="${1%% *}" name="${1%% *}"
headers="$2" shift
func="$3" check_lib $name "$@" || die "ERROR: $name_version not found"
shift 3
check_lib $name "$headers" $func "$@" || die "ERROR: $name_version not found"
} }
require_header(){ require_header(){
log require_header "$@" log require_header "$@"
headers="$1" headers="$1"
shift check_header "$@" || die "ERROR: $headers not found"
check_header "$headers" "$@" || die "ERROR: $headers not found"
} }
require_cpp_condition(){ require_cpp_condition(){
log require_cpp_condition "$@" log require_cpp_condition "$@"
header="$1"
condition="$2" condition="$2"
shift 2 check_cpp_condition "$@" || die "ERROR: $condition not satisfied"
check_cpp_condition "$header" "$condition" "$@" || die "ERROR: $condition not satisfied"
} }
require_pkg_config(){ require_pkg_config(){
......
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