aboutsummaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch
blob: 32eecf8fb7a1bbcd7d8842f37c4e6ba64724cf32 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
From e6464e01bc1cdf5496be2942d1bac41aa609f47e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 23 May 2019 23:44:06 +0200
Subject: [PATCH] Set paths to ssh-agent and ssh-add by configure options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We have no executables in our sysroot so configuration won't find them.

Upstream-Status: Inappropriate [OE specific]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 configure.ac | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4b83664..eda0c96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -351,8 +351,15 @@ if test "$enable_ssh_agent" = "no"; then
 	SSH_AGENT=false
 	SSH_ADD=false
 else
-	AC_PATH_PROG([SSH_AGENT], [ssh-agent], [no])
-	AC_PATH_PROG([SSH_ADD], [ssh-add], [no])
+    AC_ARG_WITH([ssh-agent-path],
+                [AC_HELP_STRING([--with-ssh-agent-path=PATH],
+                                 [path to ssh-agent])],
+                 [SSH_AGENT=$with_ssh_agent_path], [SSH_AGENT=no])
+    AC_ARG_WITH([ssh-add-path],
+                [AC_HELP_STRING([--with-ssh-add-path=PATH],
+                                 [path to ssh-add])],
+                 [SSH_ADD=$with_ssh_add_path], [SSH_ADD=no])
+
 	if test "$SSH_AGENT" = "no" -o "$SSH_ADD" = "no"; then
 		AC_MSG_ERROR([the ssh-agent and ssh-add commands were not found])
 	else
-- 
2.20.1