From be410be660305328787559a18b8c9b69790dbfe8 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 17 Oct 2006 14:34:42 +0000
Subject: Pth tweaks and improved estream.c

---
 scd/ChangeLog   | 9 +++++++++
 scd/Makefile.am | 4 ++--
 scd/apdu.c      | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'scd')

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  <wk@g10code.com>
+
+	* Makefile.am (scdaemon_LDADD): Link against libcommonpth.
+
+2006-10-12  Werner Koch  <wk@g10code.com>
+
+	* apdu.c: Include pth.h after unistd.h for the sake of newer Pth
+	versions.
+
 2006-10-11  Werner Koch  <wk@g10code.com>
 
 	* 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
 
 
-- 
cgit v1.2.3