RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-18 04:56:21 +00:00
Code Issues Projects Releases Wiki Activity

configure: Support the extended pkgconf syntax

Browse Source 
Make possible to require a combination of
packages and/or pin specific versions.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Luca Barbato 2015-05-31 16:47:46 +02:00
parent 8349bedfa5
commit 06db45523c
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

@ -960,8 +960,8 @@ check_pkg_config(){
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 "$@" &&
set_safe ${pkg}_cflags $pkg_cflags && set_safe "${pkg}_cflags" $pkg_cflags &&
set_safe ${pkg}_libs $pkg_libs set_safe "${pkg}_libs" $pkg_libs
} }
check_exec(){ check_exec(){
@ -1057,8 +1057,8 @@ require2(){
require_pkg_config(){ require_pkg_config(){
pkg="$1" pkg="$1"
check_pkg_config "$@" || die "ERROR: $pkg not found" check_pkg_config "$@" || die "ERROR: $pkg not found"
add_cflags $(get_safe ${pkg}_cflags) add_cflags $(get_safe "${pkg}_cflags")
add_extralibs $(get_safe ${pkg}_libs) add_extralibs $(get_safe "${pkg}_libs")
} }
hostcc_e(){ hostcc_e(){