[PATCH 0/1] MR3574: configure: don't require pcsclite header for winscard

[David McFarland (＠corngood)]

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: d405a688ba6b5042775d733f57d00ba6318e1d0f

[PATCH 1/1] configure: don't require pcsclite header for winscard

[David McFarland]

From: David McFarland

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: d405a688ba6b5042775d733f57d00ba6318e1d0f
---
 configure    | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 181835823f2..8f5541048d5 100755
--- a/configure
+++ b/configure
@@ -15860,7 +15860,7 @@ fi
         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." ;;
diff --git a/configure.ac b/configure.ac
index 4f7ba4c61bc..b903260a411 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1404,7 +1404,7 @@ then
         esac
     fi
 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])

[Hans Leidekker (＠hans)]

Hans Leidekker (@hans) commented about configure.ac:
>      esac
>  fi
>
> 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],

Looks like you can remove the other header check too, as well as the relevant line from AC_CHECK_HEADERS.

[David McFarland (＠corngood)]

On Tue Aug 15 14:23:50 2023 +0000, Hans Leidekker wrote:
> Looks like you can remove the other header check too, as well as the
> relevant line from AC_CHECK_HEADERS.

That one does seem to pass on mac, so perhaps it indicates whether `-framework PCSC` is available?  I'm a little wary of changing the mac stuff any more than necessary because I can't easily test various configurations.

[Hans Leidekker (＠hans)]

On Tue Aug 15 14:46:16 2023 +0000, David McFarland wrote:
> That one does seem to pass on mac, so perhaps it indicates whether
> `-framework PCSC` is available?  I'm a little wary of changing the mac
> stuff any more than necessary because I can't easily test various configurations.

I think we can assume it to be present in all supported version of macOS. We do that for other frameworks too. And since we don't use this header on macOS either it would be nice if we could remove these checks altogether. But yes, it needs testing.