mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* Makefile.am: Include @LIBUSB_CPPFLAGS@ in our CPPFLAGS. Strictly
speaking this should be only in gpg_CPPFLAGS, but then we have to compile everything twice for gpg and gpgv. * apdu.c (open_pcsc_reader): Fix double free. * gpg.c (main) [__APPLE__]: Default the PCSC driver to the OS X location. Suggested by Patty A. Hardy.
This commit is contained in:
parent
db90be2e94
commit
f48ef0f1f0
4 changed files with 18 additions and 4 deletions
|
@ -1711,7 +1711,9 @@ main (int argc, char **argv )
|
|||
|
||||
#ifdef ENABLE_CARD_SUPPORT
|
||||
#if defined(_WIN32) || defined(__CYGWIN__)
|
||||
opt.pcsc_driver = "winscard.dll";
|
||||
opt.pcsc_driver = "winscard.dll";
|
||||
#elif defined(__APPLE__)
|
||||
opt.pcsc_driver = "/System/Library/Frameworks/PCSC.framework/PCSC";
|
||||
#else
|
||||
opt.pcsc_driver = "libpcsclite.so";
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue