blob: 08810a94fd7dc7efdb0f52c9526c679ebfab6fcf (
plain)
1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
3 Date: Sat, 21 May 2022 18:42:21 +0000
4 Subject: [PATCH] build: Use p11_module_configs as default pkcs11-config dir
5
6 When building p11-kit with meson, `p11_system_config_modules` points at
7 the dir for system config in `/etc. This is its proper meaning.
8
9 When building p11-kit with autotools, `p11_system_config_modules` is a
10 copy of `p11_module_configs` "for compatibility", and points to the dir
11 for packaged configs in `/usr/share`.
12
13 We want the dir for packaged configs, so use the right variable.
14 ---
15 configure.ac | 10 +++++-----
16 pkcs11/rpc-layer/Makefile.am | 2 +-
17 2 files changed, 6 insertions(+), 6 deletions(-)
18
19 diff --git a/configure.ac b/configure.ac
20 index 1bf7c14c8ccc..98d8c01018fb 100644
21 --- a/configure.ac
22 +++ b/configure.ac
23 @@ -294,15 +294,15 @@ AC_ARG_WITH(pkcs11-config, [
24 [directory to install PKCS#11 config])
25 ])
26 if test -z "$with_pkcs11_config" ; then
27 - P11_SYSTEM_CONFIG_MODULES=$($PKG_CONFIG p11-kit-1 --variable=p11_system_config_modules)
28 + P11_MODULE_CONFIGS=$($PKG_CONFIG p11-kit-1 --variable=p11_module_configs)
29 else
30 - P11_SYSTEM_CONFIG_MODULES="$with_pkcs11_config"
31 + P11_MODULE_CONFIGS="$with_pkcs11_config"
32 fi
33 -if test "$P11_SYSTEM_CONFIG_MODULES" = ""; then
34 +if test "$P11_MODULE_CONFIGS" = ""; then
35 AC_MSG_ERROR([Could not find location for pkcs11 module config])
36 fi
37 -AC_MSG_RESULT($P11_SYSTEM_CONFIG_MODULES)
38 -AC_SUBST(P11_SYSTEM_CONFIG_MODULES)
39 +AC_MSG_RESULT($P11_MODULE_CONFIGS)
40 +AC_SUBST(P11_MODULE_CONFIGS)
41
42 AC_MSG_CHECKING([module path to install pkcs11 modules])
43 AC_ARG_WITH(pkcs11-modules, [
44 diff --git a/pkcs11/rpc-layer/Makefile.am b/pkcs11/rpc-layer/Makefile.am
45 index ccdff9191ad4..d3a3b57bbc6e 100644
46 --- a/pkcs11/rpc-layer/Makefile.am
47 +++ b/pkcs11/rpc-layer/Makefile.am
48 @@ -46,7 +46,7 @@ gnome_keyring_pkcs11_la_LDFLAGS = \
49 -no-undefined -export-symbols-regex 'C_GetFunctionList'
50
51 # This is the configuration file that p11-kit uses to load the module
52 -pkcs11configdir = $(P11_SYSTEM_CONFIG_MODULES)
53 +pkcs11configdir = $(P11_MODULE_CONFIGS)
54 pkcs11config_DATA = \
55 pkcs11/rpc-layer/gnome-keyring.module
56
|
