Index: libpwmd-6.0.3/src/libpwmd.c --- libpwmd-6.0.3/src/libpwmd.c.orig 2009-05-09 22:28:18.000000000 +0200 +++ libpwmd-6.0.3/src/libpwmd.c 2010-10-25 08:37:40.000000000 +0200 @@ -57,6 +57,8 @@ #include "ssh.h" #endif +#define N_(x) x + static gpg_error_t send_pinentry_options(pwm_t *pwm); static gpg_error_t _pwmd_process(pwm_t *pwm); static gpg_error_t set_pinentry_retry(pwm_t *pwm); Index: libpwmd-6.0.3/src/pinentry.c --- libpwmd-6.0.3/src/pinentry.c.orig 2009-05-08 01:37:29.000000000 +0200 +++ libpwmd-6.0.3/src/pinentry.c 2010-10-25 08:37:40.000000000 +0200 @@ -29,6 +29,8 @@ #include #endif +#define N_(x) x + static pwm_t *gpwm; static int gelapsed, gtimeout; static gpg_error_t grc; Index: pwmd-2.18/src/Makefile.am --- pwmd-2.18/src/Makefile.am.orig 2010-10-24 23:47:05.000000000 +0200 +++ pwmd-2.18/src/Makefile.am 2010-10-25 08:38:42.000000000 +0200 @@ -4,11 +4,12 @@ pwmd_SOURCES = pwmd.c pwmd.h xml.c xml.h pwmd_error.c pwmd_error.h commands.c \ commands.h common.h cache.c cache.h gettext.h misc.c misc.h \ status.c status.h mutex.h rcfile.c rcfile.h -pwmd_LDFLAGS = @XML_LIBS@ @GLIB_LIBS@ @LIBGCRYPT_LIBS@ @GPG_ERROR_LIBS@ \ +pwmd_LDFLAGS = +pwmd_LDADD = @XML_LIBS@ @GLIB_LIBS@ @LIBGCRYPT_LIBS@ @GPG_ERROR_LIBS@ \ @PTH_LDFLAGS@ @PTH_LIBS@ pwmd_CFLAGS = -DLOCALEDIR=\"${prefix}/share/locale\" @XML_CPPFLAGS@ \ @GLIB_CFLAGS@ @LIBGCRYPT_CFLAGS@ @GPG_ERROR_CFLAGS@ @PTH_CFLAGS@ -pwmd_LDADD = ${top_builddir}/assuan/src/libassuan-pth.a +pwmd_LDADD += ${top_builddir}/assuan/src/libassuan-pth.a if NEED_GETOPT_LONG pwmd_SOURCES += getopt_long.c getopt_long.h