[PATCH vkd3d] configure: Allow specifying the Vulkan library path with VULKAN_LIBS.

[Zebediah Figura]

Do not define it for the vkd3d build, but restore support for overriding it as a
configure argument.

This partially reverts 99a3adcc19f2a64fad630948851616f52c00d553.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52915
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
---
 configure.ac       | 1 +
 m4/check-vulkan.m4 | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index b386104a..7796ae8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,6 +113,7 @@ case $host_os in
 esac
 
 AC_ARG_VAR([SONAME_LIBVULKAN], [shared object name for the Vulkan library])
+AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library])
 AS_IF([test "x$SONAME_LIBVULKAN" = "x"],
       [VKD3D_CHECK_VULKAN],
       [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],["$SONAME_LIBVULKAN"],[Define to the shared object name of the Vulkan library.])])
diff --git a/m4/check-vulkan.m4 b/m4/check-vulkan.m4
index b2c3f8a1..f651a077 100644
--- a/m4/check-vulkan.m4
+++ b/m4/check-vulkan.m4
@@ -6,7 +6,8 @@ VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr],,
                                        [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr],
                                                            [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],
                                                                                ["$ac_cv_lib_soname_MoltenVK"])],
-                                                           [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])])
-                                       ])
-                   ])
+                                                           [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])],
+                                                           [$VULKAN_LIBS])],
+                                       [$VULKAN_LIBS])],
+                   [$VULKAN_LIBS])
 ])
-- 
2.34.1

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=113580

Your paranoid android.


=== debian11 (build log) ===

error: patch failed: configure.ac:113
Task: Patch failed to apply

=== debian11 (build log) ===

error: patch failed: configure.ac:113
Task: Patch failed to apply

[Henri Verbeet]

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>