highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: fix test_pkg_config_cpp after 1e5acc1b59

Browse Source
This commit is contained in:
Lynne
2021-11-27 04:37:39 +01:00
parent 7bf4c06809
commit 33be4e6ca9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@@ -1464,12 +1464,14 @@ test_pkg_config_cpp(){
cond="$4" cond="$4"
shift 4 shift 4
disable $name disable $name
test_cmd $pkg_config --exists --print-errors $pkg_version || returnddd test_cmd $pkg_config --exists --print-errors $pkg_version || return
pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg) pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg)
pkg_incflags=$($pkg_config --cflags-onyl-I $pkg_config_flags $pkg) pkg_incdir=$($pkg_config --variable=includedir $pkg_config_flags $pkg)
pkg_incflags=$($pkg_config --cflags-only-I $pkg_config_flags $pkg)
test_cpp_condition "$pkg_incdir/$headers" "$cond" "$@" && test_cpp_condition "$pkg_incdir/$headers" "$cond" "$@" &&
enable $name && enable $name &&
set_sanitized "${name}_cflags" $pkg_cflags && set_sanitized "${name}_cflags" $pkg_cflags &&
set_sanitized "${name}_incdir" $pkg_incdir &&
set_sanitized "${name}_incflags" $pkg_incflags set_sanitized "${name}_incflags" $pkg_incflags
} }