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/Makefile.am | |
| parent | * trustlist.c (read_list): Allow colons in the fingerprint. (diff) | |
| download | gnupg-1-9-10.tar.gz gnupg-1-9-10.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/Makefile.am | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/scd/Makefile.am b/scd/Makefile.am index c3c603d28..e3dfbf0b6 100644 --- a/scd/Makefile.am +++ b/scd/Makefile.am @@ -25,6 +25,13 @@ AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(top_srcdir)/common include $(top_srcdir)/am/cmacros.am +# avoid linking against Pth if we are using OpenSC. +if HAVE_OPENSC +pth_libs = +else +pth_libs = $(PTH_LIBS) +endif + AM_CFLAGS = $(OPENSC_CFLAGS) $(LIBGCRYPT_CFLAGS) \ $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS) @@ -44,9 +51,9 @@ scdaemon_SOURCES = \ scdaemon_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a \ - $(OPENSC_LIBS) $(LIBGCRYPT_LIBS) $(PTH_LIBS) \ + $(LIBGCRYPT_LIBS) $(pth_libs) \ $(KSBA_LIBS) $(LIBASSUAN_LIBS) \ - $(LIBUSB_LIBS) -lgpg-error @INTLLIBS@ -ldl + $(LIBUSB_LIBS) $(OPENSC_LIBS) -lgpg-error @INTLLIBS@ -ldl sc_investigate_SOURCES = \ sc-investigate.c scdaemon.h \ @@ -59,8 +66,8 @@ sc_investigate_SOURCES = \ sc_investigate_LDADD = \ ../jnlib/libjnlib.a ../common/libcommon.a \ - $(OPENSC_LIBS) $(LIBGCRYPT_LIBS) $(PTH_LIBS) \ - $(KSBA_LIBS) $(LIBUSB_LIBS) \ + $(LIBGCRYPT_LIBS) $(pth_libs) \ + $(KSBA_LIBS) $(LIBUSB_LIBS) $(OPENSC_LIBS) \ @INTLLIBS@ -lgpg-error -ldl @@ -76,10 +83,10 @@ sc_copykeys_SOURCES = \ sc_copykeys_LDADD = \ ../jnlib/libjnlib.a ../common/libcommon.a \ ../common/libsimple-pwquery.a \ - $(OPENSC_LIBS) $(LIBGCRYPT_LIBS) $(PTH_LIBS) \ - $(KSBA_LIBS) $(LIBUSB_LIBS) \ + $(LIBGCRYPT_LIBS) $(pth_libs) \ + $(KSBA_LIBS) $(LIBUSB_LIBS) $(OPENSC_LIBS) \ -lgpg-error @INTLLIBS@ -ldl pcsc_wrapper_SOURCES = pcsc-wrapper.c pcsc_wrapper_LDADD = -ldl -pcsc_wrapper_CFLAGS =
\ No newline at end of file +pcsc_wrapper_CFLAGS = |