diff options
| author |   djm <djm@openbsd.org> | 2015-03-31 22:57:56 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2015-03-31 22:57:56 +0000 |
| commit | 1a3a400afa8bfcd50006445f450401d262d8c7df (patch) | |
| tree | 7196b86dec7af6ba036538071519b78c2b7f9cfc | |
| parent | downgrade error() for known_hosts parse errors to debug() to quiet (diff) | |
| download | wireguard-openbsd-1a3a400afa8bfcd50006445f450401d262d8c7df.tar.xz wireguard-openbsd-1a3a400afa8bfcd50006445f450401d262d8c7df.zip | |
split SSH1 and OPENSSL build options like src/usr.bin/ssh and
update SSH1=no; ok markus@ miod@
| -rw-r--r-- | regress/usr.bin/ssh/unittests/Makefile.inc | 15 |
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 |