mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-30 16:17:02 +01:00
w32: Add macro for the registry key.
* configure.ac (GNUPG_REGISTRY_DIR) [W32]: New ac-define. * common/homedir.c (default_homedir): Use it. * common/logging.c (do_logv): Use it.
This commit is contained in:
parent
101a54add3
commit
75ba215ebd
@ -222,7 +222,7 @@ default_homedir (void)
|
||||
char *tmp;
|
||||
|
||||
tmp = read_w32_registry_string (NULL,
|
||||
"Software\\GNU\\" GNUPG_NAME,
|
||||
GNUPG_REGISTRY_DIR,
|
||||
"HomeDir");
|
||||
if (tmp && !*tmp)
|
||||
{
|
||||
|
@ -636,7 +636,7 @@ do_logv (int level, int ignore_arg_ptr, const char *fmt, va_list arg_ptr)
|
||||
|
||||
tmp = (no_registry
|
||||
? NULL
|
||||
: read_w32_registry_string (NULL, "Software\\GNU\\"GNUPG_NAME,
|
||||
: read_w32_registry_string (NULL, GNUPG_REGISTRY_DIR,
|
||||
"DefaultLogFile"));
|
||||
log_set_file (tmp && *tmp? tmp : NULL);
|
||||
jnlib_free (tmp);
|
||||
|
@ -1600,6 +1600,11 @@ AC_DEFINE_UNQUOTED(DIRMNGR_SOCK_NAME, "S.dirmngr",
|
||||
|
||||
AC_DEFINE_UNQUOTED(GPGEXT_GPG, "gpg", [The standard binary file suffix])
|
||||
|
||||
if test "$have_w32_system" = yes; then
|
||||
AC_DEFINE_UNQUOTED(GNUPG_REGISTRY_DIR, "\\Software\\GNU\\GnuPG",
|
||||
[The directory part of the W32 registry keys])
|
||||
fi
|
||||
|
||||
|
||||
#
|
||||
# Provide information about the build.
|
||||
|
Loading…
x
Reference in New Issue
Block a user