[PATCH v2 0/1] MR3389: Use PCSC framework instead of pcsclite on macOS
This framework is present in all macOS SDKs we support, starting at macOS 10.13 and still present in macOS Sonoma. Getting pcsclite completely working correctly is a lot harder on macOS and this would give us better integration. -- v2: configure: Use PCSC.framework when pcsclite is not available on macOS. https://gitlab.winehq.org/wine/wine/-/merge_requests/3389
From: Gijs Vermeulen <gijsvrm(a)gmail.com> --- configure.ac | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac index b32d2ba5aa4..a54cccf8bf5 100644 --- a/configure.ac +++ b/configure.ac @@ -403,6 +403,7 @@ AC_CHECK_HEADERS(\ CL/cl.h \ EGL/egl.h \ OpenCL/opencl.h \ + PCSC/pcsclite.h \ arpa/inet.h \ arpa/nameser.h \ asm/types.h \ @@ -1392,6 +1393,11 @@ dnl **** Check for libpcsclite **** if test "x$with_pcsclite" != "xno" then AC_CHECK_LIB(pcsclite,SCardEstablishContext,[AC_SUBST(PCSCLITE_LIBS,["-lpcsclite"])]) + if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes && test "$ac_cv_header_PCSC_pcsclite_h" = "yes" + then + AC_SUBST(PCSCLITE_LIBS,"-framework PCSC") + ac_cv_lib_pcsclite_SCardEstablishContext=yes + fi fi WINE_NOTICE_WITH(pcsclite,[test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes], [libpcsclite not found, smart cards won't be supported.], -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3389
On Tue Jul 25 14:43:28 2023 +0000, Hans Leidekker wrote:
pcsclite has more features than the native framework so it would be better to change the order. Done.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3389#note_40191
This merge request was approved by Hans Leidekker. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3389
participants (3)
-
Gijs Vermeulen -
Gijs Vermeulen (@gverm) -
Hans Leidekker (@hans)