[FFmpeg-devel] [PATCH] configure: export pkg-config includedir variable
Xiang, Haihao
haihao.xiang at intel.com
Sat Oct 9 06:07:37 EEST 2021
On Fri, 2021-10-08 at 10:32 -0300, James Almer wrote:
> Some packages may not define custom cflags, in which case a simple
> "pkg-config --cflags" call will return an empty string.
> This change will be useful to get a valid include path that can be
> used in library checks.
>
> Signed-off-by: James Almer <jamrial at gmail.com>
> ---
> configure | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/configure b/configure
> index 5e630e6e5d..92610c7edc 100755
> --- a/configure
> +++ b/configure
> @@ -1446,9 +1446,11 @@ test_pkg_config(){
> test_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)
> + pkg_incdir=$($pkg_config --variable=includedir $pkg_config_flags $pkg)
> check_func_headers "$headers" "$funcs" $pkg_cflags $pkg_libs "$@" &&
> enable $name &&
> set_sanitized "${name}_cflags" $pkg_cflags &&
> + set_sanitized "${name}_incdir" $pkg_incdir &&
> set_sanitized "${name}_extralibs" $pkg_libs
> }
>
> @@ -1466,7 +1468,8 @@ test_pkg_config_cpp(){
> pkg_incdir=$($pkg_config --variable=includedir $pkg_config_flags $pkg)
> test_cpp_condition "$pkg_incdir/$headers" "$cond" "$@" &&
> enable $name &&
> - set_sanitized "${name}_cflags" $pkg_cflags
> + set_sanitized "${name}_cflags" $pkg_cflags &&
> + set_sanitized "${name}_incdir" $pkg_incdir
> }
>
> check_pkg_config(){
LGTM, and I can update my patchset to use ${libmfx_incdir} once this patch is
merged.
Regards
Haihao
More information about the ffmpeg-devel
mailing list