diff options
| author | Justus Winter <[email protected]> | 2016-12-14 13:18:22 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-12-14 15:41:18 +0000 |
| commit | ca1e9749bfb069d90aa44efbf6f3d611b6104c1b (patch) | |
| tree | 523a466ed36ebeb7b54d6149fddebfe5475edbd9 /common/util.h | |
| parent | tests: Rework check for trust models. (diff) | |
| download | gnupg-ca1e9749bfb069d90aa44efbf6f3d611b6104c1b.tar.gz gnupg-ca1e9749bfb069d90aa44efbf6f3d611b6104c1b.zip | |
common: Support locating components in the build tree.
* common/homedir.c (gnupg_build_directory): New variable.
(gnupg_module_name_called): Likewise.
(gnupg_set_builddir): New function.
(gnupg_set_builddir_from_env): Likewise.
(gnupg_module_name): Support locating components in the build tree.
* common/util.h (gnupg_set_builddir): New prototype.
* tests/openpgp/defs.scm (tools): Drop 'gpg and 'gpg-agent.
(tool): Rename to 'tool-hardcoded.
(gpg-conf): New function, with accessors for the results.
(gpg-components): New variable.
(tool): New function.
* tools/gpgconf.c (enum cmd_and_opt_values): New key.
(opts): New option '--build-prefix'.
(main): Handle new option.
--
This change makes sure that the components from the build tree are
used, and not some older installed version in PATH. It also lets us
make GPGME use components from the build tree, making it possible to
execute GPGME's test suite with them.
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to 'common/util.h')
| -rw-r--r-- | common/util.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/common/util.h b/common/util.h index 2ff2bbcb3..f7a53e160 100644 --- a/common/util.h +++ b/common/util.h @@ -263,6 +263,7 @@ char *_gnupg_socketdir_internal (int skip_checks, unsigned *r_info); #define GNUPG_MODULE_NAME_GPGV 12 const char *gnupg_module_name (int which); void gnupg_module_name_flush_some (void); +void gnupg_set_builddir (const char *newdir); |