1From 2618ab101f5faaa887c9feeeee84a7d8bc97cbda Mon Sep 17 00:00:00 2001 2From: Alexander Kanavin <alex@linutronix.de> 3Date: Wed, 16 Nov 2022 11:27:24 +0100 4Subject: [PATCH] meson.build: correctly handle disabled ssh_agent option 5 6Existing 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 10Signed-off-by: Alexander Kanavin <alex@linutronix.de> 11 12Upstream-Status: Backport [ https://gitlab.gnome.org/GNOME/gcr/-/commit/9b67bb18d8409e0e693cc6000507acbd73a30eab ] 13 14--- 15 meson.build | 6 ++++-- 16 1 file changed, 4 insertions(+), 2 deletions(-) 17 18diff --git a/meson.build b/meson.build 19index dd890a9..1b17b18 100644 20--- a/meson.build 21+++ b/meson.build 22@@ -82,8 +82,10 @@ conf.set('HAVE_TIMEGM', cc.has_function('timegm')) 23 conf.set('HAVE_MLOCK', cc.has_function('mlock')) 24 conf.set_quoted('GPG_EXECUTABLE', gpg_path) 25 conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version()) 26-conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path) 27-conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path) 28+if get_option('ssh_agent') 29+ conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path) 30+ conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path) 31+endif 32 conf.set10('WITH_SYSTEMD', with_systemd) 33 config_file = configure_file( 34 output: 'config.h', 35