diff options
author | James Almer <jamrial@gmail.com> | 2017-04-09 13:11:08 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-04-09 13:11:08 -0300 |
commit | adf9f0416fab5c870adaad00712273576b20017c (patch) | |
tree | 7c73d8f3140d5b3b1485abb44c1dbe79e88a9fd0 /configure | |
parent | 0905c679eb245d822c829116306bb6d38b2b63ec (diff) | |
parent | 2a096440768b1086bb437939f827b8b7a5716bf7 (diff) |
Merge commit '2a096440768b1086bb437939f827b8b7a5716bf7'
* commit '2a096440768b1086bb437939f827b8b7a5716bf7':
configure: Separate package name and version requirements in helper functions
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1233,12 +1233,12 @@ check_lib_cpp(){ check_pkg_config(){ log check_pkg_config "$@" - pkgandversion="$1" + pkg_version="$1" pkg="${1%% *}" headers="$2" funcs="$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_libs=$($pkg_config --libs $pkg_config_flags $pkg) check_func_headers "$headers" "$funcs" $pkg_cflags $pkg_libs "$@" && @@ -1323,11 +1323,11 @@ check_compile_assert(){ require(){ log require "$@" - name="$1" + name_version="$1" headers="$2" func="$3" shift 3 - check_lib "$headers" $func "$@" || die "ERROR: $name not found" + check_lib "$headers" $func "$@" || die "ERROR: $name_version not found" } require_cpp(){ |