From df05dde9d59e4ed2a8eefd0a5e285f4930ac7e3a Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 3 Mar 2005 10:15:07 +0000 Subject: [PATCH] * acinclude.m4 (GNUPG_PTH_VERSION_CHECK): Accidently used --ldflags instead of --cflags. Reported by Kazu Yamamoto. * Makefile.am (AM_CFLAGS): Added PTH_CFLAGS. Noted by Kazu Yamamoto. * Makefile.am (gpgsm_LDADD): Added PTH_LIBS. Noted by Kazu Yamamoto. --- ChangeLog | 5 +++++ THANKS | 3 ++- TODO | 2 ++ acinclude.m4 | 2 +- agent/command-ssh.c | 2 +- common/ChangeLog | 4 ++++ common/Makefile.am | 2 +- sm/ChangeLog | 4 ++++ sm/Makefile.am | 2 +- 9 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c86f42a8..c9f9fe3dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-03-03 Werner Koch + + * acinclude.m4 (GNUPG_PTH_VERSION_CHECK): Accidently used + --ldflags instead of --cflags. Reported by Kazu Yamamoto. + 2005-02-03 Werner Koch * AUTHORS: Copied from 1.4 and edited to refelct the changes in diff --git a/THANKS b/THANKS index d523474c7..e1424cab1 100644 --- a/THANKS +++ b/THANKS @@ -1,5 +1,6 @@ Alexander Belopolsky belopolsky at mac.com -Richard Lefebvre rick at cerca.umontreal.ca Andrew J. Schorr aschorr at telemetry-investments.com +Kazu Yamamoto kazu@iij.ad.jp Michael Nottebrock michaelnottebrock at gmx.net +Richard Lefebvre rick at cerca.umontreal.ca diff --git a/TODO b/TODO index 2aace782f..9efbe6a1c 100644 --- a/TODO +++ b/TODO @@ -104,3 +104,5 @@ might want to have an agent context for each service request ** No card status notifications. +* [scdaemon] release the card after use so that gpg 1.4 is abale to access it + diff --git a/acinclude.m4 b/acinclude.m4 index 31f540640..e933e6ee0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -246,7 +246,7 @@ AC_DEFUN([GNUPG_PTH_VERSION_CHECK], _gnupg_pth_save_cflags=$CFLAGS _gnupg_pth_save_ldflags=$LDFLAGS _gnupg_pth_save_libs=$LIBS - CFLAGS="$CFLAGS `$PTH_CONFIG --ldflags`" + CFLAGS="$CFLAGS `$PTH_CONFIG --cflags`" LDFLAGS="$LDFLAGS `$PTH_CONFIG --ldflags`" LIBS="$LIBS `$PTH_CONFIG --libs`" AC_LINK_IFELSE([AC_LANG_PROGRAM([#include diff --git a/agent/command-ssh.c b/agent/command-ssh.c index 3b2dcd335..f48df69e4 100644 --- a/agent/command-ssh.c +++ b/agent/command-ssh.c @@ -1550,7 +1550,7 @@ key_secret_to_public (gcry_sexp_t *key_public, key. Store a copy of that key at R_PK and return 0. If no key is available store NULL at R_PK and return an error code. If CARDSN is no NULL, a string with the serial number of the card will be - amalloced and stored there. */ + a malloced and stored there. */ static gpg_error_t card_key_available (ctrl_t ctrl, gcry_sexp_t *r_pk, char **cardsn) { diff --git a/common/ChangeLog b/common/ChangeLog index db0593176..e9bb42a57 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,3 +1,7 @@ +2005-03-03 Werner Koch + + * Makefile.am (AM_CFLAGS): Added PTH_CFLAGS. Noted by Kazu Yamamoto. + 2005-02-25 Werner Koch * xasprintf.c (xtryasprintf): New. diff --git a/common/Makefile.am b/common/Makefile.am index 6cbbf9f3a..ed7659793 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -21,7 +21,7 @@ noinst_LIBRARIES = libcommon.a libsimple-pwquery.a -AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) +AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(PTH_CFLAGS) libcommon_a_SOURCES = \ util.h i18n.h \ diff --git a/sm/ChangeLog b/sm/ChangeLog index a4f07b048..85af542d0 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -1,3 +1,7 @@ +2005-03-03 Werner Koch + + * Makefile.am (gpgsm_LDADD): Added PTH_LIBS. Noted by Kazu Yamamoto. + 2005-01-13 Werner Koch * certreqgen.c (proc_parameters): Cast printf arg. diff --git a/sm/Makefile.am b/sm/Makefile.am index 9136eb920..d4f972527 100644 --- a/sm/Makefile.am +++ b/sm/Makefile.am @@ -54,6 +54,6 @@ gpgsm_SOURCES = \ gpgsm_LDADD = ../jnlib/libjnlib.a ../kbx/libkeybox.a \ ../common/libcommon.a \ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) -lgpg-error \ - $(LIBINTL) + $(LIBINTL) $(PTH_LIBS)