system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 17:04:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

configure: Fix caching of PCSCLITE_LIBS on mac.

Browse source 
ac_cv_lib_pcsclite_SCardEstablishContext=yes would be cached, causing
AC_CHECK_LIB to use -lpcsclite on the second run.

Fixes: f74c4af257
This commit is contained in:
David McFarland 2023-08-13 22:43:50 -03:00 committed by Alexandre Julliard
parent 91f8926023
commit d405a688ba
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
configure vendored
View file

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

8
configure.ac
View file

@ -1396,11 +1396,13 @@ 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
case $host_os in
darwin*|macosx*)
AC_SUBST(PCSCLITE_LIBS,"-framework PCSC") ;;
esac
fi
fi
WINE_NOTICE_WITH(pcsclite,[test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes],
WINE_NOTICE_WITH(pcsclite,[test "x$PCSCLITE_LIBS" = x || test "$ac_cv_header_PCSC_pcsclite_h" != "yes"],
[libpcsclite not found, smart cards won't be supported.],
[enable_winscard])