summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--Makefile.in6
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 986c2ae2c..56a808bcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
120110213 120110213
2 - (djm) [misc.c] include time.h for nanosleep() prototype 2 - (djm) [misc.c] include time.h for nanosleep() prototype
3 - (tim) [Makefile.in] test the ECC bits if we have the capability. ok djm
3 4
420110212 520110212
5 - OpenBSD CVS Sync 6 - OpenBSD CVS Sync
diff --git a/Makefile.in b/Makefile.in
index 7c55c7582..13b6dedea 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.315 2011/01/08 22:19:53 djm Exp $ 1# $Id: Makefile.in,v 1.316 2011/01/13 03:06:38 tim Exp $
2 2
3# uncomment if you run a non bourne compatable shell. Ie. csh 3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@ 4#SHELL = @SH@
@@ -407,6 +407,7 @@ tests interop-tests: $(TARGETS)
407 TEST_SSH_PUTTYGEN="puttygen"; \ 407 TEST_SSH_PUTTYGEN="puttygen"; \
408 TEST_SSH_CONCH="conch"; \ 408 TEST_SSH_CONCH="conch"; \
409 TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \ 409 TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \
410 TEST_SSH_ECC="@TEST_SSH_ECC@" ; \
410 cd $(srcdir)/regress || exit $$?; \ 411 cd $(srcdir)/regress || exit $$?; \
411 $(MAKE) \ 412 $(MAKE) \
412 .OBJDIR="$${BUILDDIR}/regress" \ 413 .OBJDIR="$${BUILDDIR}/regress" \
@@ -427,7 +428,8 @@ tests interop-tests: $(TARGETS)
427 TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \ 428 TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \
428 TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \ 429 TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \
429 TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \ 430 TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \
430 TEST_SSH_IPV6="@TEST_SSH_IPV6@" \ 431 TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \
432 TEST_SSH_ECC="$${TEST_SSH_ECC}" \
431 EXEEXT="$(EXEEXT)" \ 433 EXEEXT="$(EXEEXT)" \
432 $@ && echo all tests passed 434 $@ && echo all tests passed
433 435