diff --git a/configure b/configure index e5a787198d36fd555ce1e60a9ee12f3476225262..37482cf1ef558048f248f1a5751318548759a0b6 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") }