Skip to content

W
wine-winehq
Commit d405a688 authored by David McFarland's avatar David McFarland Committed by Alexandre Julliard
Browse files
Options

configure: Fix caching of PCSCLITE_LIBS on mac.

ac_cv_lib_pcsclite_SCardEstablishContext=yes would be cached, causing AC_CHECK_LIB to use -lpcsclite on the second run. Fixes: f74c4af2
parent 91f89260
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 6 deletions
configure
View file @ d405a688
......@@ -15853,12 +15853,14 @@ 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"
ac_cv_lib_pcsclite_SCardEstablishContext=yes
;;
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." ;;
......
configure.ac
View file @ d405a688
......@@ -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])
......
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