diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2023-10-20 11:35:46 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2023-10-20 11:35:46 +0200 |
| commit | ff85becd5f5f06a76efa45d30fb204a3c5e5215c (patch) | |
| tree | 4dfbd69585369ac4b4e0fc5b8aa519d3a0386723 | |
| parent | upstream: Allow overriding the locations of the Dropbear binaries (diff) | |
| download | openssh-ff85becd5f5f06a76efa45d30fb204a3c5e5215c.tar.xz openssh-ff85becd5f5f06a76efa45d30fb204a3c5e5215c.zip | |
Have configure find PuTTY and Conch binaries.
This will let us remove some -portable specific changes from
test-exec.sh.
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 0e2fdf310..1efe11f6f 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 c3fe76cf5..b074b7043 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]) |