mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Merge branch 'STABLE-BRANCH-2-2' into master
-- Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
commit
c817e75028
20 changed files with 429 additions and 252 deletions
16
configure.ac
16
configure.ac
|
@ -1738,6 +1738,22 @@ if test x"$gnupg_builddir_envvar" = x"yes"; then
|
|||
[This is only used with "make distcheck"])
|
||||
fi
|
||||
|
||||
|
||||
#
|
||||
# To avoid problems with systemd cleaning up the /run/user directory,
|
||||
# this option will make GnuPG try to use /run/gnupg/user as socket dir
|
||||
# before /run/user
|
||||
#
|
||||
AC_ARG_ENABLE(run-gnupg-user-socket,
|
||||
AC_HELP_STRING([--enable-run-gnupg-user-socket],
|
||||
[try /run/gnupg/user for sockets prior to /run/user]),
|
||||
use_run_gnupg_user_socket=$enableval)
|
||||
if test x"$use_run_gnupg_user_socket" = x"yes"; then
|
||||
AC_DEFINE(USE_RUN_GNUPG_USER_SOCKET, 1,
|
||||
[If defined try /run/gnupg/user before /run/user])
|
||||
fi
|
||||
|
||||
|
||||
#
|
||||
# Decide what to build
|
||||
#
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue