[PATCH vkd3d 7/8] configure: Remove the no longer used check for VULKAN_LIBS.

Zebediah Figura zfigura at codeweavers.com
Mon Apr 18 20:28:47 CDT 2022


Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
 configure.ac       |  1 -
 m4/check-vulkan.m4 | 16 ++++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 15ec60de5..1885edffb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,7 +113,6 @@ case $host_os in
      ;;
 esac
 
-AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library])
 VKD3D_CHECK_VULKAN
 
 AS_IF([test "x$with_ncurses" != "xno"],
diff --git a/m4/check-vulkan.m4 b/m4/check-vulkan.m4
index 756f61a0e..b2c3f8a12 100644
--- a/m4/check-vulkan.m4
+++ b/m4/check-vulkan.m4
@@ -1,16 +1,12 @@
 dnl VKD3D_CHECK_VULKAN
 AC_DEFUN([VKD3D_CHECK_VULKAN],[
-VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr],
-                   [VULKAN_LIBS="$VULKAN_LIBS -lvulkan"],
+VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr],,
                    [VKD3D_CHECK_SONAME([vulkan-1], [vkGetInstanceProcAddr],
-                                       [VULKAN_LIBS="$VULKAN_LIBS -lvulkan-1"
-                                        AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_vulkan_1"])],
+                                       [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_vulkan_1"])],
                                        [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr],
-                                                           [VULKAN_LIBS="$VULKAN_LIBS -lMoltenVK"
-                                                            AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],
+                                                           [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],
                                                                                ["$ac_cv_lib_soname_MoltenVK"])],
-                                                           [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])],
-                                                           [$VULKAN_LIBS])],
-                                       [$VULKAN_LIBS])],
-                   [$VULKAN_LIBS])
+                                                           [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])])
+                                       ])
+                   ])
 ])
-- 
2.35.1




More information about the wine-devel mailing list