[FFmpeg-cvslog] configure: Add test_pkg_config()
James Almer
git at videolan.org
Sat Nov 11 20:49:45 EET 2017
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Sep 29 22:56:08 2017 -0300| [d66fe7ff53a5cade7a702100a9006dfe5ae1c473] | committer: Diego Biurrun
configure: Add test_pkg_config()
This helper is split off check_pkg_config(), setting only the pkg CFLAGS
and extralibs. This is useful for checks that do not require or do not
benefit from setting global CFLAGS.
Signed-off-by: James Almer <jamrial at gmail.com>
Signed-off-by: Diego Biurrun <diego at biurrun.de>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d66fe7ff53a5cade7a702100a9006dfe5ae1c473
---
configure | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index a3cfe37680..aa87ac7279 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,15 @@ 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 "${name}_cflags" $pkg_cflags &&
+ set_sanitized "${name}_extralibs" $pkg_libs
+}
+
+check_pkg_config(){
+ log check_pkg_config "$@"
+ name="$1"
+ test_pkg_config "$@" &&
+ eval add_cflags \$${name}_cflags
}
check_exec(){
More information about the ffmpeg-cvslog
mailing list