summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2015-03-31 22:57:57 +0000
committerDamien Miller <djm@cvs.openbsd.org>2015-03-31 22:57:57 +0000
commit5d55c3614b5027a03266e6bac9ddd5163b19f3b8 (patch)
treee45de5683b5c369d56e8c5c0c4514fbc7aa8e2bf /regress
parent6bdd3a0ec208fb0d450565bdafc56bdab41fa3fd (diff)
split SSH1 and OPENSSL build options like src/usr.bin/ssh and
update SSH1=no; ok markus@ miod@
Diffstat (limited to 'regress')
-rw-r--r--regress/usr.bin/ssh/unittests/Makefile.inc15
1 files changed, 12 insertions, 3 deletions
diff --git a/regress/usr.bin/ssh/unittests/Makefile.inc b/regress/usr.bin/ssh/unittests/Makefile.inc
index c022b044625..5aa7c5685c6 100644
--- a/regress/usr.bin/ssh/unittests/Makefile.inc
+++ b/regress/usr.bin/ssh/unittests/Makefile.inc
@@ -1,14 +1,23 @@
-# $OpenBSD: Makefile.inc,v 1.3 2015/01/23 21:21:23 miod Exp $
+# $OpenBSD: Makefile.inc,v 1.4 2015/03/31 22:57:56 djm Exp $
.include <bsd.own.mk>
.include <bsd.obj.mk>
REGRESS_FAIL_EARLY= yes
-# XXX detect from ssh binary?
+# XXX detect from ssh binary?
+SSH1?= no
OPENSSL?= yes
+
.if (${OPENSSL:L} == "yes")
-CFLAGS+= -DWITH_OPENSSL -DWITH_SSH1
+CFLAGS+= -DWITH_OPENSSL
+.else
+# SSH v.1 requires OpenSSL.
+SSH1= no
+.endif
+
+.if (${SSH1:L} == "yes")
+CFLAGS+= -DWITH_SSH1
.endif
# enable warnings