aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2015-05-31 16:47:46 +0200
committerLuca Barbato <lu_zero@gentoo.org>2015-06-02 10:33:11 +0200
commit06db45523c1068c24f049ef2b20fcdead3bf36d8 (patch)
tree71e5e87698c2ef1405d0cf5e705e5f909d84cf2a /configure
parent8349bedfa5eac7f261ac43053a2f66b894bac288 (diff)
downloadffmpeg-06db45523c1068c24f049ef2b20fcdead3bf36d8.tar.gz
configure: Support the extended pkgconf syntax
Make possible to require a combination of packages and/or pin specific versions. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure8
1 files changed, 4 insertions, 4 deletions
diff --git a/configure b/configure
index af9d7a5478..f077eb4fa5 100755
--- a/configure
+++ b/configure
@@ -960,8 +960,8 @@ check_pkg_config(){
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 "$@" &&
- set_safe ${pkg}_cflags $pkg_cflags &&
- set_safe ${pkg}_libs $pkg_libs
+ set_safe "${pkg}_cflags" $pkg_cflags &&
+ set_safe "${pkg}_libs" $pkg_libs
}
check_exec(){
@@ -1057,8 +1057,8 @@ require2(){
require_pkg_config(){
pkg="$1"
check_pkg_config "$@" || die "ERROR: $pkg not found"
- add_cflags $(get_safe ${pkg}_cflags)
- add_extralibs $(get_safe ${pkg}_libs)
+ add_cflags $(get_safe "${pkg}_cflags")
+ add_extralibs $(get_safe "${pkg}_libs")
}
hostcc_e(){