virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

configure: Separate package name and version requirements in helper functions

Browse Source 
The unadorned package name is needed to derive package-related variable names.
This commit is contained in:
Diego Biurrun 2016-11-16 18:10:35 +01:00
parent ffb9025f39
commit 2a09644076
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -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")
}