| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 1 | From 9b67bb18d8409e0e693cc6000507acbd73a30eab Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex@linutronix.de> |
| 3 | Date: Wed, 16 Nov 2022 11:27:24 +0100 |
| 4 | Subject: [PATCH 1/2] meson.build: correctly handle disabled ssh_agent option |
| 5 | |
| 6 | Existing code produces these errors: |
| 7 | | gcr/meson.build:61:0: ERROR: Unable to get the path of a not-found external program |
| 8 | | gcr/meson.build:101:5: ERROR: Unknown variable "ssh_add_path". |
| 9 | |
| 10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| 11 | |
| 12 | Upstream-Status: Backport [ https://gitlab.gnome.org/GNOME/gcr/-/commit/9b67bb18d8409e0e693cc6000507acbd73a30eab ] |
| 13 | --- |
| 14 | meson.build | 12 ++++++++---- |
| 15 | 1 file changed, 8 insertions(+), 4 deletions(-) |
| 16 | |
| 17 | diff --git a/meson.build b/meson.build |
| 18 | index 3f35173..11d7fa7 100644 |
| 19 | --- a/meson.build |
| 20 | +++ b/meson.build |
| 21 | @@ -58,8 +58,10 @@ if p11_system_config_modules == '' |
| 22 | error('Couldn\'t find location for pkcs11 module config') |
| 23 | endif |
| 24 | libsecret_dep = dependency('libsecret-1', version: '>= 0.20', required: get_option('ssh_agent')) |
| 25 | -ssh_add_path = find_program('ssh-add', required: get_option('ssh_agent')).full_path() |
| 26 | -ssh_agent_path = find_program('ssh-agent', required: get_option('ssh_agent')).full_path() |
| 27 | +if get_option('ssh_agent') |
| 28 | + ssh_add_path = find_program('ssh-add').full_path() |
| 29 | + ssh_agent_path = find_program('ssh-agent').full_path() |
| 30 | +endif |
| 31 | |
| 32 | with_systemd = false |
| 33 | libsystemd_deps = [] |
| 34 | @@ -96,8 +98,10 @@ conf.set('HAVE_TIMEGM', cc.has_function('timegm')) |
| 35 | conf.set('HAVE_MLOCK', cc.has_function('mlock')) |
| 36 | conf.set_quoted('GPG_EXECUTABLE', gpg_path) |
| 37 | conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version()) |
| 38 | -conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path) |
| 39 | -conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path) |
| 40 | +if get_option('ssh_agent') |
| 41 | + conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path) |
| 42 | + conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path) |
| 43 | +endif |
| 44 | conf.set10('WITH_SYSTEMD', with_systemd) |
| 45 | config_file = configure_file( |
| 46 | output: 'config.h', |
| 47 | -- |
| 48 | 2.34.1 |
| 49 | |