[openssh-commits] [openssh] 03/05: Have configure find PuTTY and Conch binaries.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit ff85becd5f5f06a76efa45d30fb204a3c5e5215c
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Fri Oct 20 20:35:46 2023 +1100

    Have configure find PuTTY and Conch binaries.
    
    This will let us remove some -portable specific changes from
    test-exec.sh.
---
 Makefile.in  | 6 +++---
 configure.ac | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 0e2fdf31..1efe11f6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -751,9 +751,9 @@ interop-tests t-exec file-tests extra-tests: regress-prep regress-binaries $(TAR
 		TEST_SSH_SK_HELPER="$(BUILDDIR)/ssh-sk-helper" \
 		TEST_SSH_SFTPSERVER="$(BUILDDIR)/sftp-server" \
 		TEST_SSH_MODULI_FILE="$(abs_top_srcdir)/moduli" \
-		TEST_SSH_PLINK="plink" \
-		TEST_SSH_PUTTYGEN="puttygen" \
-		TEST_SSH_CONCH="conch" \
+		TEST_SSH_PLINK="@PLINK@" \
+		TEST_SSH_PUTTYGEN="@PUTTYGEN@" \
+		TEST_SSH_CONCH="@CONCH@" \
 		TEST_SSH_DROPBEAR="@DROPBEAR@" \
 		TEST_SSH_DROPBEARKEY="@DROPBEARKEY@" \
 		TEST_SSH_DROPBEARCONVERT="@DROPBEARCONVERT@" \
diff --git a/configure.ac b/configure.ac
index c3fe76cf..b074b704 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5577,6 +5577,9 @@ AC_SUBST([UNSUPPORTED_ALGORITHMS], [$unsupported_algorithms])
 AC_SUBST([DEPEND], [$(cat $srcdir/.depend)])
 
 # Binaries for interop tests.
+AC_PATH_PROG([PLINK], [plink])
+AC_PATH_PROG([PUTTYGEN], [puttygen])
+AC_PATH_PROG([CONCH], [conch])
 AC_PATH_PROG([DROPBEAR], [dropbear])
 AC_PATH_PROG([DBCLIENT], [dbclient])
 AC_PATH_PROG([DROPBEARKEY], [dropbearkey])

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.