summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-06-11 05:15:51 +1000
committerDarren Tucker <dtucker@zip.com.au>2008-06-11 05:15:51 +1000
commit34f49c60fd8f5320ac91f191379adf748405ed9a (patch)
tree4b7c1b6b27b0a0d587fad8188b4f2cc25e309123
parent5d37690a1f702db627f00146a5ace7949676eeb0 (diff)
- (dtucker) [Makefile.in] Define TEST_SSH_IPV6 in make's arguments as well
as environment.
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in3
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6f484c648..53a094a85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,6 +42,8 @@
42 since the new CIDR code in addmatch.c references it. 42 since the new CIDR code in addmatch.c references it.
43 - (dtucker) [Makefile.in configure.ac regress/addrmatch.sh] Skip IPv6 43 - (dtucker) [Makefile.in configure.ac regress/addrmatch.sh] Skip IPv6
44 specific tests on platforms that don't do IPv6. 44 specific tests on platforms that don't do IPv6.
45 - (dtucker) [Makefile.in] Define TEST_SSH_IPV6 in make's arguments as well
46 as environment.
45 47
4620080609 4820080609
47 - (dtucker) OpenBSD CVS Sync 49 - (dtucker) OpenBSD CVS Sync
@@ -4128,4 +4130,4 @@
4128 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4130 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4129 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4131 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4130 4132
4131$Id: ChangeLog,v 1.4959 2008/06/10 18:15:05 dtucker Exp $ 4133$Id: ChangeLog,v 1.4960 2008/06/10 19:15:51 dtucker Exp $
diff --git a/Makefile.in b/Makefile.in
index a2192eb5d..66d394af6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.292 2008/06/10 18:15:05 dtucker Exp $ 1# $Id: Makefile.in,v 1.293 2008/06/10 19:15:51 dtucker 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@
@@ -413,6 +413,7 @@ tests interop-tests: $(TARGETS)
413 TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ 413 TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \
414 TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \ 414 TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \
415 TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \ 415 TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \
416 TEST_SSH_IPV6="@TEST_SSH_IPV6@" \
416 EXEEXT="$(EXEEXT)" \ 417 EXEEXT="$(EXEEXT)" \
417 $@ 418 $@
418 419