mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
No more warnings for AMD64 (at least when cross-compiling). Thus tehre is a
good chance that gpg2 will now work. Other cleanups. Updated gettext.
This commit is contained in:
parent
5885142c83
commit
e50c5f39cc
132 changed files with 7331 additions and 5486 deletions
|
@ -1,3 +1,10 @@
|
|||
2006-11-21 Werner Koch <wk@g10code.com>
|
||||
|
||||
* Makefile.am (libexec_PROGRAMS): Put pscs-wrapper into libexec.
|
||||
Renamed to gnupg-pcsc-wrapper.
|
||||
* apdu.c (open_pcsc_reader): Use GNUPG_LIBEXECDIR to accces the
|
||||
wrapper. Suggested by Eric Dorland.
|
||||
|
||||
2006-11-20 Werner Koch <wk@g10code.com>
|
||||
|
||||
* app-openpgp.c (verify_chv2): Support for keypads (only CHV2).
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
bin_PROGRAMS = scdaemon
|
||||
if ! HAVE_W32_SYSTEM
|
||||
pkglib_PROGRAMS = pcsc-wrapper
|
||||
libexec_PROGRAMS = gnupg-pcsc-wrapper
|
||||
endif
|
||||
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common
|
||||
|
@ -67,6 +67,6 @@ scdaemon_LDADD = ../jnlib/libjnlib.a ../common/libcommonpth.a ../gl/libgnu.a \
|
|||
# $(LIBUSB_LIBS) \
|
||||
# -lgpg-error @LIBINTL@ @DL_LIBS@
|
||||
#
|
||||
pcsc_wrapper_SOURCES = pcsc-wrapper.c
|
||||
pcsc_wrapper_LDADD = $(DL_LIBS)
|
||||
pcsc_wrapper_CFLAGS =
|
||||
gnupg_pcsc_wrapper_SOURCES = pcsc-wrapper.c
|
||||
gnupg_pcsc_wrapper_LDADD = $(DL_LIBS)
|
||||
gnupg_pcsc_wrapper_CFLAGS =
|
||||
|
|
|
@ -1338,7 +1338,7 @@ open_pcsc_reader (const char *portstr)
|
|||
int err;
|
||||
unsigned int dummy_status;
|
||||
int sw = SW_HOST_CARD_IO_ERROR;
|
||||
const char *wrapperpgm = GNUPG_LIBDIR "/pcsc-wrapper";
|
||||
const char *wrapperpgm = GNUPG_LIBEXECDIR "/gnupg-pcsc-wrapper";
|
||||
|
||||
if (access (wrapperpgm, X_OK))
|
||||
{
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* pcsc-wrapper.c - Wrapper for ccessing the PC/SC service
|
||||
/* pcsc-wrapper.c - Wrapper for accessing the PC/SC service
|
||||
* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
|
||||
*
|
||||
* This file is part of GnuPG.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue