mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-11-23 18:23:25 +08:00
Have configure find PuTTY and Conch binaries.
This will let us remove some -portable specific changes from test-exec.sh.
This commit is contained in:
parent
c54a50359b
commit
ff85becd5f
@ -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@" \
|
||||
|
@ -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])
|
||||
|
Loading…
Reference in New Issue
Block a user