This helper is split off check_pkg_config(), setting pkg but not global
cflags and extralibs. This is useful for checks that don't require or
benefit from setting the latter.
Signed-off-by: James Almer <jamr...@gmail.com>
---
configure | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index a3cfe3768..b9b243362 100755
--- a/configure
+++ b/configure
@@ -1025,8 +1025,8 @@ check_lib(){
enable $name && eval ${name}_extralibs="\$@"
}
-check_pkg_config(){
- log check_pkg_config "$@"
+test_pkg_config(){
+ log test_pkg_config "$@"
name="$1"
pkg_version="$2"
pkg="${2%% *}"
@@ -1039,8 +1039,16 @@ check_pkg_config(){
pkg_libs=$($pkg_config --libs $pkg_config_flags $pkg)
check_func_headers "$headers" "$funcs" $pkg_cflags $pkg_libs "$@" &&
enable $name &&
- add_cflags "$pkg_cflags" &&
- eval $(sanitize_var_name ${name}_extralibs)="\$pkg_libs"
+ set_sanitized "${pkg}_cflags" $pkg_cflags &&
+ set_sanitized "${pkg}_extralibs" $pkg_libs
+}
+
+check_pkg_config(){
+ log check_pkg_config "$@"
+ pkg="${2%% *}"
+ test_pkg_config "$@" || return
+ add_cflags $(get_sanitized "${pkg}_cflags")
+ add_extralibs $(get_sanitized "${pkg}_extralibs")
}
check_exec(){
--
2.14.1
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
