Commit 61a17423 authored by Diego Biurrun's avatar Diego Biurrun

configure: Miscellaneous small changes to helper functions

- Reuse sanitize_var_name() where appropriate
- Add some quotes to enabled()/disabled() to ease readability
- Fix logged names of some helper functions
- Filter LDFLAGS also in test_ldflags()
parent 67c72f08
...@@ -513,13 +513,13 @@ disable_weak(){ ...@@ -513,13 +513,13 @@ disable_weak(){
enable_sanitized(){ enable_sanitized(){
for var; do for var; do
enable $(echo "$var" | sed 's/[^A-Za-z0-9_]/_/g') enable $(sanitize_var_name $var)
done done
} }
disable_sanitized(){ disable_sanitized(){
for var; do for var; do
disable $(echo "$var" | sed 's/[^A-Za-z0-9_]/_/g') disable $(sanitize_var_name $var)
done done
} }
...@@ -552,12 +552,12 @@ enable_deep_weak(){ ...@@ -552,12 +552,12 @@ enable_deep_weak(){
} }
enabled(){ enabled(){
test "${1#!}" = "$1" && op== || op=!= test "${1#!}" = "$1" && op="=" || op="!="
eval test "x\$${1#!}" $op "xyes" eval test "x\$${1#!}" $op "xyes"
} }
disabled(){ disabled(){
test "${1#!}" = "$1" && op== || op=!= test "${1#!}" = "$1" && op="=" || op="!="
eval test "x\$${1#!}" $op "xno" eval test "x\$${1#!}" $op "xno"
} }
...@@ -899,6 +899,7 @@ check_objcflags(){ ...@@ -899,6 +899,7 @@ check_objcflags(){
test_ldflags(){ test_ldflags(){
log test_ldflags "$@" log test_ldflags "$@"
set -- $($ldflags_filter "$@")
check_ld "$@" <<EOF check_ld "$@" <<EOF
int main(void){ return 0; } int main(void){ return 0; }
EOF EOF
...@@ -1125,14 +1126,14 @@ require(){ ...@@ -1125,14 +1126,14 @@ require(){
} }
require_header(){ require_header(){
log require "$@" log require_header "$@"
headers="$1" headers="$1"
shift shift
check_header "$headers" "$@" || die "ERROR: $headers not found" check_header "$headers" "$@" || die "ERROR: $headers not found"
} }
require_cpp_condition(){ require_cpp_condition(){
log require "$@" log require_cpp_condition "$@"
header="$1" header="$1"
condition="$2" condition="$2"
shift 2 shift 2
......
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