[libav-devel] [PATCH 3/5] configure: Drop some unnecessary variables and shifts in helper functions

[Diego Biurrun]

---
 configure | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/configure b/configure
index abaf240224..8b35d565e6 100755
--- a/configure
+++ b/configure
@@ -1007,11 +1007,9 @@ EOF
 check_lib(){
     log check_lib "$@"
     name="$1"
-    headers="$2"
-    funcs="$3"
-    shift 3
+    shift
     disable $name
-    check_func_headers "$headers" "$funcs" "$@" &&
+    check_func_headers "$@" &&
         enable $name && eval ${name}_extralibs="\$@"
 }
 
@@ -1098,11 +1096,9 @@ check_struct(){
 check_builtin(){
     log check_builtin "$@"
     name=$1
-    headers=$2
-    builtin=$3
-    shift 3
+    shift
     disable "$name"
-    check_code ld "$headers" "$builtin" "$@" && enable "$name"
+    check_code ld "$@" && enable "$name"
 }
 
 check_compile_assert(){
@@ -1119,25 +1115,20 @@ require(){
     log require "$@"
     name_version="$1"
     name="${1%% *}"
-    headers="$2"
-    func="$3"
-    shift 3
-    check_lib $name "$headers" $func "$@" || die "ERROR: $name_version not 
found"
+    shift
+    check_lib $name "$@" || die "ERROR: $name_version not found"
 }
 
 require_header(){
     log require_header "$@"
     headers="$1"
-    shift
-    check_header "$headers" "$@" || die "ERROR: $headers not found"
+    check_header "$@" || die "ERROR: $headers not found"
 }
 
 require_cpp_condition(){
     log require_cpp_condition "$@"
-    header="$1"
     condition="$2"
-    shift 2
-    check_cpp_condition "$header" "$condition" "$@" || die "ERROR: $condition 
not satisfied"
+    check_cpp_condition "$@" || die "ERROR: $condition not satisfied"
 }
 
 require_pkg_config(){
-- 
2.11.0

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel