From 2a096440768b1086bb437939f827b8b7a5716bf7 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Wed, 16 Nov 2016 18:10:35 +0100
Subject: [PATCH] configure: Separate package name and version requirements in
 helper functions

The unadorned package name is needed to derive package-related variable names.
---
 configure | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index e5a787198d..37482cf1ef 100755
--- a/configure
+++ b/configure
@@ -1009,11 +1009,12 @@ check_lib(){
 
 check_pkg_config(){
     log check_pkg_config "$@"
-    pkg="$1"
+    pkg_version="$1"
+    pkg="${1%% *}"
     headers="$2"
     funcs="$3"
     shift 3
-    check_cmd $pkg_config --exists --print-errors $pkg || return
+    check_cmd $pkg_config --exists --print-errors $pkg_version || return
     pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg)
     pkg_libs=$($pkg_config --libs $pkg_config_flags $pkg)
     check_func_headers "$headers" "$funcs" $pkg_cflags $pkg_libs "$@" &&
@@ -1098,17 +1099,18 @@ check_compile_assert(){
 
 require(){
     log require "$@"
-    name="$1"
+    name_version="$1"
     headers="$2"
     func="$3"
     shift 3
-    check_lib "$headers" $func "$@" || die "ERROR: $name not found"
+    check_lib "$headers" $func "$@" || die "ERROR: $name_version not found"
 }
 
 require_pkg_config(){
     log require_pkg_config "$@"
-    pkg="$1"
-    check_pkg_config "$@" || die "ERROR: $pkg not found"
+    pkg_version="$1"
+    pkg="${1%% *}"
+    check_pkg_config "$@" || die "ERROR: $pkg_version not found"
     add_cflags    $(get_safe "${pkg}_cflags")
     add_extralibs $(get_safe "${pkg}_libs")
 }