Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meson: add option to allow override default default_pkcs11_module #511

Merged
merged 1 commit into from
Jan 22, 2025
Merged

meson: add option to allow override default default_pkcs11_module #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,12 @@ if host_machine.endian() == 'big'
endif

p11_kit = dependency('p11-kit-1', required: false)
if p11_kit.found()
default_pkcs11_module = get_option('default_pkcs11_module')
if default_pkcs11_module == '' and p11_kit.found()
default_pkcs11_module = p11_kit.get_variable(pkgconfig: 'proxy_module')
endif

if default_pkcs11_module != ''
conf.set_quoted('DEFAULT_PKCS11_MODULE', default_pkcs11_module)
endif

Expand Down
5 changes: 5 additions & 0 deletions meson_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,8 @@ option('enable_explicit_EC_test',
type: 'boolean',
value: false,
description: 'Enable explicit EC tests')

option('default_pkcs11_module',
type : 'string',
value : '',
description : 'Path to the default PKCS11 module')
Loading