Merge commit '61a17423d3711cb34a18b44e1ec2510c2f70a56c'

* commit '61a17423d3711cb34a18b44e1ec2510c2f70a56c':
  configure: Miscellaneous small changes to helper functions

Merged-by: James Almer <jamrial@gmail.com>

diff --cc configure
index 20e36066e2a7a65e35ed2e161e4f7e3c60889676,4dfe24e39e5fed59c375c769574e5b14ed56a39f..c0f3706c058ca444cf303c7c2d1074929af4b94a
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -677,13 -551,8 +677,13 @@@ enable_deep_weak()
      done
  }
  
-     test "${1#!}" = "$1" && op='=' || op=!=
 +requested(){
++    test "${1#!}" = "$1" && op="=" || op="!="
 +    eval test "x\$${1#!}_requested" $op "xyes"
 +}
 +
  enabled(){
-     test "${1#!}" = "$1" && op='=' || op=!=
+     test "${1#!}" = "$1" && op="=" || op="!="
      eval test "x\$${1#!}" $op "xyes"
  }
  
@@@ -1081,7 -899,8 +1081,8 @@@ check_objcflags()
  
  test_ldflags(){
      log test_ldflags "$@"
 -    check_ld "$@" <<EOF
+     set -- $($ldflags_filter "$@")
 +    check_ld "cc" "$@" <<EOF
  int main(void){ return 0; }
  EOF
  }
@@@ -1381,16 -1125,8 +1382,16 @@@ require()
      check_lib $name "$headers" $func "$@" || die "ERROR: $name_version not found"
  }
  
 +require_cpp(){
 +    name="$1"
 +    headers="$2"
 +    classes="$3"
 +    shift 3
 +    check_lib_cpp "$headers" "$classes" "$@" || die "ERROR: $name not found"
 +}
 +
  require_header(){
-     log require "$@"
+     log require_header "$@"
      headers="$1"
      shift
      check_header "$headers" "$@" || die "ERROR: $headers not found"