2 files changed, 5 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 225eff6cc..88b46a19d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
  - (djm) [atomicio.c configure.ac] Disable poll() fallback in atomiciov for
    Tru64. readv doesn't seem to be a comparable object there.
    bz#1386, patch from dtucker@ ok me
+ - (djm) [Makefile.in] Pass though pass to conch for interop tests
  - (djm) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2008/07/04 23:08:25
      [packet.c]
@@ -4590,4 +4591,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5062 2008/07/04 23:44:53 djm Exp $
+$Id: ChangeLog,v 1.5063 2008/07/04 23:50:23 djm Exp $
diff --git a/Makefile.in b/Makefile.in
index dd26ae0e7..5b63d896e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.295 2008/06/26 05:59:32 djm Exp $
+# $Id: Makefile.in,v 1.296 2008/07/04 23:50:24 djm Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -396,6 +396,7 @@ tests interop-tests:	$(TARGETS)
         TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \
         TEST_SSH_PLINK="plink"; \
         TEST_SSH_PUTTYGEN="puttygen"; \
+        TEST_SSH_CONCH="conch"; \
         TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \
         cd $(srcdir)/regress || exit $$?; \
         $(MAKE) \
@@ -415,6 +416,7 @@ tests interop-tests:	$(TARGETS)
                 TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \
                 TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \
                 TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \
+                TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \
                 TEST_SSH_IPV6="@TEST_SSH_IPV6@" \
                 EXEEXT="$(EXEEXT)" \
                 $@