Have configure find PuTTY and Conch binaries.

This will let us remove some -portable specific changes from
test-exec.sh.

diff --git a/Makefile.in b/Makefile.in
index 0e2fdf310f41f0bd371c48c333ab50d4ad893ed0..1efe11f6f27b51fcf984da10c5aab9c3156d876d 100644 (file)
--- 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 c3fe76cf526e2469dd0662bc16bfe220c854d953..b074b704361b80f8bcb090309d6c3dd3518d0df1 100644 (file)
--- 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])