aboutsummaryrefslogtreecommitdiffstats
path: root/agent
diff options
context:
space:
mode:
Diffstat (limited to 'agent')
-rw-r--r--agent/ChangeLog4
-rw-r--r--agent/Makefile.am4
-rw-r--r--agent/gpg-agent.c1
3 files changed, 7 insertions, 2 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog
index 86f62be48..9c57ad43e 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-01 Werner Koch <[email protected]>
+
+ * gpg-agent.c: Include setenv.h.
+
2005-05-31 Werner Koch <[email protected]>
* agent.h (out_of_core): s/__inline__/inine. Noted by Ray Link.
diff --git a/agent/Makefile.am b/agent/Makefile.am
index df8ec322c..017b84795 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = gpg-agent
libexec_PROGRAMS = gpg-protect-tool gpg-preset-passphrase
-AM_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/intl
+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl
include $(top_srcdir)/am/cmacros.am
@@ -44,7 +44,7 @@ gpg_agent_SOURCES = \
learncard.c
-gpg_agent_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a \
+gpg_agent_LDADD = ../gl/libgnu.a ../jnlib/libjnlib.a ../common/libcommon.a \
$(LIBGCRYPT_LIBS) $(PTH_LIBS) $(LIBASSUAN_LIBS) \
-lgpg-error @LIBINTL@
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index c793e7eab..3537b07f0 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -48,6 +48,7 @@
#ifdef HAVE_W32_SYSTEM
#include "../jnlib/w32-afunix.h"
#endif
+#include "setenv.h"
enum cmd_and_opt_values