summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2021-10-08 10:27:19 -0300
committerJames Almer <jamrial@gmail.com>2021-10-09 09:50:12 -0300
commit7a1976919c5f6ec45f6701be81cf347a8007de96 (patch)
treee37876d44f32bdea002ac5ef83ff41256347b6e4 /configure
parent99b4acd3fa2904d90990372444bf00133a3bf9e6 (diff)
configure: export pkg-config includedir variable
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. Reviewed-by: Haihao Xiang <haihao.xiang@intel.com> Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 4 insertions, 1 deletions
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(){