har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '2a096440768b1086bb437939f827b8b7a5716bf7'

Browse Source 
* commit '2a096440768b1086bb437939f827b8b7a5716bf7':
  configure: Separate package name and version requirements in helper functions

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-04-09 13:11:08 -03:00
commit adf9f0416f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -1233,12 +1233,12 @@ check_lib_cpp(){
check_pkg_config(){ check_pkg_config(){
log check_pkg_config "$@" log check_pkg_config "$@"
pkgandversion="$1" pkg_version="$1"
pkg="${1%% *}" pkg="${1%% *}"
headers="$2" headers="$2"
funcs="$3" funcs="$3"
shift 3 shift 3
check_cmd $pkg_config --exists --print-errors $pkgandversion || return check_cmd $pkg_config --exists --print-errors $pkg_version || return
pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg) pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg)
pkg_libs=$($pkg_config --libs $pkg_config_flags $pkg) pkg_libs=$($pkg_config --libs $pkg_config_flags $pkg)
check_func_headers "$headers" "$funcs" $pkg_cflags $pkg_libs "$@" && check_func_headers "$headers" "$funcs" $pkg_cflags $pkg_libs "$@" &&
@ -1323,11 +1323,11 @@ check_compile_assert(){
require(){ require(){
log require "$@" log require "$@"
name="$1" name_version="$1"
headers="$2" headers="$2"
func="$3" func="$3"
shift 3 shift 3
check_lib "$headers" $func "$@" || die "ERROR: $name not found" check_lib "$headers" $func "$@" || die "ERROR: $name_version not found"
} }
require_cpp(){ require_cpp(){