[gnome-keyring/wip/nielsdg/meson] fixup! Support Meson build system
- From: Jan Tojnar <jtojnar src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring/wip/nielsdg/meson] fixup! Support Meson build system
- Date: Sun, 22 May 2022 15:55:08 +0000 (UTC)
commit 07d0ee1fa0fde35b9907fb00d0b9b54311abe4cb
Author: Jan Tojnar <jtojnar gmail com>
Date: Sun May 22 17:20:40 2022 +0200
fixup! Support Meson build system
meson.build | 2 +-
meson_options.txt | 6 ++++++
pkcs11/rpc-layer/meson.build | 21 +++++++++++++++++++++
3 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index 5041f806..81c791ab 100644
--- a/meson.build
+++ b/meson.build
@@ -37,7 +37,7 @@ libselinux_dep = dependency('libselinux', required: get_option('selinux'))
libsystemd_dep = dependency('libsystemd', required: get_option('systemd'))
if libsystemd_dep.found()
- systemd_user_unit_dir = dependency('systemd').get_variable('systemduserunitdir', pkgconfig_define:
['root_prefix', get_option('prefix')])
+ systemd_user_unit_dir = dependency('systemd').get_variable('systemduserunitdir', pkgconfig_define:
['prefix', gkr_prefix])
endif
if get_option('ssh-agent')
diff --git a/meson_options.txt b/meson_options.txt
index 37ea781c..1ef56545 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -28,6 +28,12 @@ option('pkcs11-config',
description: 'Directory to install PKCS#11 config (if empty, the default value for p11-kit will be used)',
)
+option('pkcs11-modules',
+ type: 'string',
+ value: '',
+ description: 'Directory to install PKCS#11 modules (if empty, the default value for p11-kit will be used)',
+)
+
option('manpage',
type: 'boolean',
value: true,
diff --git a/pkcs11/rpc-layer/meson.build b/pkcs11/rpc-layer/meson.build
index 444a8f0f..b1ed8937 100644
--- a/pkcs11/rpc-layer/meson.build
+++ b/pkcs11/rpc-layer/meson.build
@@ -25,6 +25,27 @@ libgkm_rpc_layer_dep = declare_dependency(
link_with: libgkm_rpc_layer,
)
+# The module code, built as the public gnome-keyring module
+
+# This is the location that some older software looks for modules
+p11_module_path = get_option('pkcs11-modules')
+if p11_module_path == ''
+ p11_module_path = p11_kit_dep.get_pkgconfig_variable('p11_module_path')
+endif
+shared_module(
+ 'gnome-keyring-pkcs11',
+ sources: [
+ 'gkm-rpc-module.c',
+ 'gkm-rpc-message.c',
+ 'gkm-rpc-util.c',
+ ],
+ dependencies: [
+ libegg_dep
+ ],
+ install: true,
+ install_dir: p11_module_path,
+)
+
# This is the configuration file that p11-kit uses to load the module
p11_system_config_module = get_option('pkcs11-config')
if p11_system_config_module == ''
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]