diff options
| author | Werner Koch <[email protected]> | 2006-10-17 14:34:42 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2006-10-17 14:34:42 +0000 |
| commit | be410be660305328787559a18b8c9b69790dbfe8 (patch) | |
| tree | 32a7dd94b21d1973c1ceedc3d71e13df34f0c83b /scd | |
| parent | Fixed aegypten bug 372 (diff) | |
| download | gnupg-be410be660305328787559a18b8c9b69790dbfe8.tar.gz gnupg-be410be660305328787559a18b8c9b69790dbfe8.zip | |
Pth tweaks and improved estream.c
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/ChangeLog | 9 | ||||
| -rw-r--r-- | scd/Makefile.am | 4 | ||||
| -rw-r--r-- | scd/apdu.c | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog index 41a89b8b7..d584495c3 100644 --- a/scd/ChangeLog +++ b/scd/ChangeLog @@ -1,3 +1,12 @@ +2006-10-17 Werner Koch <[email protected]> + + * Makefile.am (scdaemon_LDADD): Link against libcommonpth. + +2006-10-12 Werner Koch <[email protected]> + + * apdu.c: Include pth.h after unistd.h for the sake of newer Pth + versions. + 2006-10-11 Werner Koch <[email protected]> * app-openpgp.c (do_sign): Redirect to do_auth for OpenPGP.3. diff --git a/scd/Makefile.am b/scd/Makefile.am index 63356dba8..894016cf8 100644 --- a/scd/Makefile.am +++ b/scd/Makefile.am @@ -44,9 +44,9 @@ scdaemon_SOURCES = \ app.c app-common.h app-help.c $(card_apps) -scdaemon_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \ +scdaemon_LDADD = ../jnlib/libjnlib.a ../common/libcommonpth.a ../gl/libgnu.a \ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \ - $(LIBUSB_LIBS) -lgpg-error $(LIBINTL) $(DL_LIBS) $(NETLIBS) + $(LIBUSB_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(DL_LIBS) $(NETLIBS) # Removed for now: We need to decide whether it makes sense to # continue it at all, given that gpg has now all required diff --git a/scd/apdu.c b/scd/apdu.c index 01c48cdf0..242849adb 100644 --- a/scd/apdu.c +++ b/scd/apdu.c @@ -33,9 +33,9 @@ #include <assert.h> #include <signal.h> #ifdef USE_GNU_PTH -# include <pth.h> # include <unistd.h> # include <fcntl.h> +# include <pth.h> #endif |