From f74c4af257e0856e6607d2823e4f03109111a4b6 Mon Sep 17 00:00:00 2001 From: Gijs Vermeulen Date: Tue, 25 Jul 2023 17:54:48 +0200 Subject: [PATCH] configure: Use PCSC.framework when pcsclite is not available on macOS. --- configure | 12 ++++++++++++ configure.ac | 6 ++++++ include/config.h.in | 3 +++ 3 files changed, 21 insertions(+) diff --git a/configure b/configure index 36ae965fe34..9c15f952298 100755 --- a/configure +++ b/configure @@ -7854,6 +7854,12 @@ if test "x$ac_cv_header_OpenCL_opencl_h" = xyes then : printf "%s\n" "#define HAVE_OPENCL_OPENCL_H 1" >>confdefs.h +fi +ac_fn_c_check_header_compile "$LINENO" "PCSC/pcsclite.h" "ac_cv_header_PCSC_pcsclite_h" "$ac_includes_default" +if test "x$ac_cv_header_PCSC_pcsclite_h" = xyes +then : + printf "%s\n" "#define HAVE_PCSC_PCSCLITE_H 1" >>confdefs.h + fi ac_fn_c_check_header_compile "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default" if test "x$ac_cv_header_arpa_inet_h" = xyes @@ -15843,6 +15849,12 @@ then : fi + if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes && test "$ac_cv_header_PCSC_pcsclite_h" = "yes" + then + PCSCLITE_LIBS="-framework PCSC" + + ac_cv_lib_pcsclite_SCardEstablishContext=yes + fi fi if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes then : diff --git a/configure.ac b/configure.ac index c782c17ac61..dab2bb07302 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 \ @@ -1393,6 +1394,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.], diff --git a/include/config.h.in b/include/config.h.in index 9836ec64cf9..41011c3b0b8 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -297,6 +297,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_PCAP_PCAP_H +/* Define to 1 if you have the header file. */ +#undef HAVE_PCSC_PCSCLITE_H + /* Define to 1 if you have the `pipe2' function. */ #undef HAVE_PIPE2