diff options
| author | Werner Koch <[email protected]> | 2004-07-22 10:52:56 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2004-07-22 10:52:56 +0000 |
| commit | 44bf2d0ae4adbcf5b6b404bfc6526c461ae6a92a (patch) | |
| tree | 6f2a43756a965f1c36194b4c91781555ba4701a0 /scd/sc-investigate.c | |
| parent | * trustlist.c (read_list): Allow colons in the fingerprint. (diff) | |
| download | gnupg-44bf2d0ae4adbcf5b6b404bfc6526c461ae6a92a.tar.gz gnupg-44bf2d0ae4adbcf5b6b404bfc6526c461ae6a92a.zip | |
* configure.ac: Define AM conditional HAVE_OPENSC.V1-9-10
* Makefile.am: Make OpenSC lib link after libgcrypt. Do not link
to pth.
* apdu.c: Don't use Pth if we use OpenSC.
* sc-investigate.c, scdaemon.c: Disable use of pth if OpenSC is used.
* scdaemon.c (main): Bumbed thread stack size up to 512k.
Diffstat (limited to '')
| -rw-r--r-- | scd/sc-investigate.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/scd/sc-investigate.c b/scd/sc-investigate.c index be985533c..8d34ab77e 100644 --- a/scd/sc-investigate.c +++ b/scd/sc-investigate.c @@ -90,12 +90,12 @@ static ARGPARSE_OPTS opts[] = { {0} }; - +#ifndef HAVE_OPENSC #ifdef USE_GNU_PTH /* Pth wrapper function definitions. */ GCRY_THREAD_OPTION_PTH_IMPL; #endif /*USE_GNU_PTH*/ - +#endif /*!HAVE_OPENSC*/ static void interactive_shell (int slot); static void dump_other_cards (int slot); @@ -160,8 +160,10 @@ main (int argc, char **argv ) /* Try to auto set the character set. */ set_native_charset (NULL); - /* Libgcrypt requires us to register the threading model first. - Note that this will also do the pth_init. */ + /* Libgcrypt requires us to register the threading model first. We + can't use pth at all if we are using OpenSC becuase OpenSC uses + ptreads. Note that this will also do the pth_init. */ +#ifndef HAVE_OPENSC #ifdef USE_GNU_PTH rc = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth); if (rc) @@ -170,6 +172,7 @@ main (int argc, char **argv ) gpg_strerror (rc)); } #endif /*USE_GNU_PTH*/ +#endif /*!HAVE_OPENSC*/ /* Check that the libraries are suitable. Do it here because the option parsing may need services of the library */ |