configure: Don't require pcsclite header for winscard.

The header is unused, and the header check fails with: configure:7860: checking for PCSC/pcsclite.h configure:7860: gcc -m32 -c -g -O2 conftest.c >&5 In file included from conftest.c:50: [...]/include/PCSC/pcsclite.h:45:10: fatal error: wintypes.h: No such file or directory 45 | #include <wintypes.h> | ^~~~~~~~~~~~ Fixes: d405a688

configure: Don't require pcsclite header for winscard.
4a4d3524 · David McFarland · Alexandre Julliard · 5c315905 · 4a4d3524 · 4a4d3524
Commit 4a4d3524 authored Aug 15, 2023 by David McFarland Committed by Alexandre Julliard Aug 15, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 28 deletions

configure configure +6 -15

configure.ac configure.ac +5 -10

config.h.in include/config.h.in +0 -3

No files found.
--- a/configure
+++ b/configure
@@ -7858,12 +7858,6 @@ 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
 then :
@@ -15849,18 +15843,15 @@ if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" = xyes
 then :
  PCSCLITE_LIBS="-lpcsclite"

+else $as_nop
+  case $host_os in
+                    darwin*|macosx*) PCSCLITE_LIBS="-framework PCSC"
+ ;;
+                  esac
 fi

-    if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes && test "$ac_cv_header_PCSC_pcsclite_h" = "yes"
-    then
-        case $host_os in
-          darwin*|macosx*)
-            PCSCLITE_LIBS="-framework PCSC"
- ;;
-        esac
-    fi
 fi
-if test "x$PCSCLITE_LIBS" = x || test "$ac_cv_header_PCSC_pcsclite_h" != "yes"
+if test "x$PCSCLITE_LIBS" = x
 then :
  case "x$with_pcsclite" in
  x)   as_fn_append wine_notices "|libpcsclite not found, smart cards won't be supported." ;;

--- a/configure.ac
+++ b/configure.ac
@@ -403,7 +403,6 @@ AC_CHECK_HEADERS(\
 	CL/cl.h \
 	EGL/egl.h \
 	OpenCL/opencl.h \
-	PCSC/pcsclite.h \
 	arpa/inet.h \
 	arpa/nameser.h \
 	asm/types.h \
@@ -1395,16 +1394,12 @@ WINE_NOTICE_WITH(pcap,[test "x$ac_cv_lib_pcap_pcap_init" != xyes],
 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
-        case $host_os in
-          darwin*|macosx*)
-            AC_SUBST(PCSCLITE_LIBS,"-framework PCSC") ;;
-        esac
-    fi
+    AC_CHECK_LIB(pcsclite,SCardEstablishContext,[AC_SUBST(PCSCLITE_LIBS,["-lpcsclite"])],
+                 [case $host_os in
+                    darwin*|macosx*) AC_SUBST(PCSCLITE_LIBS,"-framework PCSC") ;;
+                  esac])
 fi
-WINE_NOTICE_WITH(pcsclite,[test "x$PCSCLITE_LIBS" = x || test "$ac_cv_header_PCSC_pcsclite_h" != "yes"],
+WINE_NOTICE_WITH(pcsclite,[test "x$PCSCLITE_LIBS" = x],
                 [libpcsclite not found, smart cards won't be supported.],
                 [enable_winscard])


--- a/include/config.h.in
+++ b/include/config.h.in
@@ -297,9 +297,6 @@
 /* Define to 1 if you have the <pcap/pcap.h> header file. */
 #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. */
 #undef HAVE_PIPE2