diff options
| author | Werner Koch <[email protected]> | 2010-10-08 14:37:42 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-10-08 14:37:42 +0000 |
| commit | a3335428becd9e18560e6ee98a196cd06eb9ee6c (patch) | |
| tree | 8853ea7cc0e85ef696fc3da74231190f5867d52e /common | |
| parent | Add new option --with-keygrip (diff) | |
| download | gnupg-a3335428becd9e18560e6ee98a196cd06eb9ee6c.tar.gz gnupg-a3335428becd9e18560e6ee98a196cd06eb9ee6c.zip | |
New configure optionh --enable-dirmngr-auto-start.
autogen.sh enables this for CE.
Diffstat (limited to 'common')
| -rw-r--r-- | common/asshelp.c | 10 |
1 files changed, 9 insertions, 1 deletions
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) { |