Commit f74c4af2 authored by Gijs Vermeulen's avatar Gijs Vermeulen Committed by Alexandre Julliard

configure: Use PCSC.framework when pcsclite is not available on macOS.

parent 37885b04
...@@ -7855,6 +7855,12 @@ then : ...@@ -7855,6 +7855,12 @@ then :
printf "%s\n" "#define HAVE_OPENCL_OPENCL_H 1" >>confdefs.h printf "%s\n" "#define HAVE_OPENCL_OPENCL_H 1" >>confdefs.h
fi 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" 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 if test "x$ac_cv_header_arpa_inet_h" = xyes
then : then :
...@@ -15843,6 +15849,12 @@ then : ...@@ -15843,6 +15849,12 @@ then :
fi 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 fi
if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes
then : then :
......
...@@ -403,6 +403,7 @@ AC_CHECK_HEADERS(\ ...@@ -403,6 +403,7 @@ AC_CHECK_HEADERS(\
CL/cl.h \ CL/cl.h \
EGL/egl.h \ EGL/egl.h \
OpenCL/opencl.h \ OpenCL/opencl.h \
PCSC/pcsclite.h \
arpa/inet.h \ arpa/inet.h \
arpa/nameser.h \ arpa/nameser.h \
asm/types.h \ asm/types.h \
...@@ -1393,6 +1394,11 @@ dnl **** Check for libpcsclite **** ...@@ -1393,6 +1394,11 @@ dnl **** Check for libpcsclite ****
if test "x$with_pcsclite" != "xno" if test "x$with_pcsclite" != "xno"
then then
AC_CHECK_LIB(pcsclite,SCardEstablishContext,[AC_SUBST(PCSCLITE_LIBS,["-lpcsclite"])]) 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 fi
WINE_NOTICE_WITH(pcsclite,[test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes], WINE_NOTICE_WITH(pcsclite,[test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes],
[libpcsclite not found, smart cards won't be supported.], [libpcsclite not found, smart cards won't be supported.],
......
...@@ -297,6 +297,9 @@ ...@@ -297,6 +297,9 @@
/* Define to 1 if you have the <pcap/pcap.h> header file. */ /* Define to 1 if you have the <pcap/pcap.h> header file. */
#undef HAVE_PCAP_PCAP_H #undef HAVE_PCAP_PCAP_H
/* Define to 1 if you have the <PCSC/pcsclite.h> header file. */
#undef HAVE_PCSC_PCSCLITE_H
/* Define to 1 if you have the `pipe2' function. */ /* Define to 1 if you have the `pipe2' function. */
#undef HAVE_PIPE2 #undef HAVE_PIPE2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment