From a3335428becd9e18560e6ee98a196cd06eb9ee6c Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 8 Oct 2010 14:37:42 +0000 Subject: New configure optionh --enable-dirmngr-auto-start. autogen.sh enables this for CE. --- common/asshelp.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'common/asshelp.c') diff --git a/common/asshelp.c b/common/asshelp.c index b98825bd3..15f6b4005 100644 --- a/common/asshelp.c +++ b/common/asshelp.c @@ -547,7 +547,6 @@ start_new_dirmngr (assuan_context_t *r_ctx, gpg_error_t err; assuan_context_t ctx; const char *sockname; - lock_spawn_t lock; *r_ctx = NULL; @@ -560,8 +559,10 @@ start_new_dirmngr (assuan_context_t *r_ctx, sockname = dirmngr_socket_name (); err = assuan_socket_connect (ctx, sockname, 0, 0); +#ifdef USE_DIRMNGR_AUTO_START if (err) { + lock_spawn_t lock; const char *argv[2]; /* With no success try start a new Dirmngr. On most systems @@ -619,6 +620,13 @@ start_new_dirmngr (assuan_context_t *r_ctx, unlock_spawning (&lock, "dirmngr"); } +#else + (void)homedir; + (void)dirmngr_program; + (void)verbose; + (void)status_cb; + (void)status_cb_arg; +#endif /*USE_DIRMNGR_AUTO_START*/ if (err) { -- cgit v1.2.3