diff options
| author | Werner Koch <[email protected]> | 2007-02-18 13:48:03 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2007-02-18 13:48:03 +0000 |
| commit | fedae25efd8ca61de00e06aff4dd06cb28541877 (patch) | |
| tree | 1dfef5da9738ed0616d1751b7480cc22731e60d0 /scd | |
| parent | agent/ (diff) | |
| download | gnupg-fedae25efd8ca61de00e06aff4dd06cb28541877.tar.gz gnupg-fedae25efd8ca61de00e06aff4dd06cb28541877.zip | |
doc/
* gpg.texi (GPG Esoteric Options): No card reader options for gpg2.
scd/
* scdaemon.c (DEFAULT_PCSC_DRIVER): Add a default for OS X.
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/ChangeLog | 4 | ||||
| -rw-r--r-- | scd/scdaemon.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog index 9c6900117..38ef4f234 100644 --- a/scd/ChangeLog +++ b/scd/ChangeLog @@ -1,3 +1,7 @@ +2007-02-18 Werner Koch <[email protected]> + + * scdaemon.c (DEFAULT_PCSC_DRIVER): Add a default for OS X. + 2007-01-25 Werner Koch <[email protected]> * Makefile.am (scdaemon_LDADD): Added LIBICONV. Noted by Billy diff --git a/scd/scdaemon.c b/scd/scdaemon.c index 6993b75e6..19c656202 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -139,9 +139,11 @@ static ARGPARSE_OPTS opts[] = { }; -/* The card dirver we use by default for PC/SC. */ +/* The card driver we use by default for PC/SC. */ #if defined(HAVE_W32_SYSTEM) || defined(__CYGWIN__) #define DEFAULT_PCSC_DRIVER "winscard.dll" +#elif defined(__APPLE__) +#define DEFAULT_PCSC_DRIVER "/System/Library/Frameworks/PCSC.framework/PCSC" #elif defined(__GLIBC__) #define DEFAULT_PCSC_DRIVER "libpcsclite.so.1" #else |