diff --git a/configure b/configure index 48f0cfb967..8a397598cd 100755 --- a/configure +++ b/configure @@ -1635,7 +1635,7 @@ test_pkg_config_cpp(){ pkg_cflags=$($pkg_config --cflags $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" $pkg_cflags "$@" && enable $name && set_sanitized "${name}_cflags" $pkg_cflags && set_sanitized "${name}_incdir" $pkg_incdir && @@ -7708,7 +7708,7 @@ if enabled_all vulkan vulkan_static; then check_lib vulkan "vulkan/vulkan.h" vkGetInstanceProcAddr -lvulkan elif enabled vulkan; then check_pkg_config_header_only vulkan "vulkan >= 1.3.277" "vulkan/vulkan.h" "defined VK_VERSION_1_3" || - check_cpp_condition vulkan "vulkan/vulkan.h" "defined(VK_VERSION_1_4) || (defined(VK_VERSION_1_3) && VK_HEADER_VERSION >= 277)" + check_cpp_condition vulkan "vulkan/vulkan.h" "defined(VK_VERSION_1_4) || (defined(VK_VERSION_1_3) && VK_HEADER_VERSION >= 277)" $vulkan_incflags fi probe_glslc(){ @@ -7752,7 +7752,7 @@ probe_glslc(){ if enabled vulkan; then check_pkg_config_header_only vulkan_1_4 "vulkan >= 1.4.317" "vulkan/vulkan.h" "defined VK_VERSION_1_4" || - check_cpp_condition vulkan_1_4 "vulkan/vulkan.h" "defined(VK_VERSION_1_5) || (defined(VK_VERSION_1_4) && VK_HEADER_VERSION >= 317)" + check_cpp_condition vulkan_1_4 "vulkan/vulkan.h" "defined(VK_VERSION_1_5) || (defined(VK_VERSION_1_4) && VK_HEADER_VERSION >= 317)" $vulkan_incflags for program in $glslc glslc glslang glslangValidator; do probe_glslc $program && break done