Sun Mar 1 21:00:40 2015 UTC ()
Sync the HAVE's with reality


(christos)
diff -r1.7 -r1.8 src/crypto/external/bsd/openssh/Makefile.inc
cvs diff -r1.7 -r1.8 src/crypto/external/bsd/openssh/Makefile.inc (expand / switch to unified diff)

--- src/crypto/external/bsd/openssh/Makefile.inc 2015/01/16 20:17:49 1.7
+++ src/crypto/external/bsd/openssh/Makefile.inc 2015/03/01 21:00:40 1.8
@@ -1,25 +1,31 @@ @@ -1,25 +1,31 @@
1# $NetBSD: Makefile.inc,v 1.7 2015/01/16 20:17:49 christos Exp $ 1# $NetBSD: Makefile.inc,v 1.8 2015/03/01 21:00:40 christos Exp $
2 2
3WARNS?= 4 3WARNS?= 4
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7USE_FORT?= yes # network client/server 7USE_FORT?= yes # network client/server
8WITH_OPENSSL=1 8WITH_OPENSSL=1
9 9
10SSHDIST?= ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist 10SSHDIST?= ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist
11 11
12CPPFLAGS+=-I${SSHDIST} -DHAVE_LOGIN_CAP -DHAVE_MMAP -DHAVE_OPENPTY 12CPPFLAGS+=-I${SSHDIST}
 13
 14CPPFLAGS+=-DHAVE_DLOPEN
 15CPPFLAGS+=-DHAVE_HEADER_AD
 16CPPFLAGS+=-DHAVE_LOGIN_CAP
 17CPPFLAGS+=-DHAVE_STDLIB_H
 18
13CPPFLAGS+=-DWITH_SSH1 -DWITH_OPENSSL -DENABLE_PKCS11 -D_OPENBSD_SOURCE 19CPPFLAGS+=-DWITH_SSH1 -DWITH_OPENSSL -DENABLE_PKCS11 -D_OPENBSD_SOURCE
14.if !defined(NOPIC) 20.if !defined(NOPIC)
15CPPFLAGS+=-DHAVE_DLOPEN 21CPPFLAGS+=-DHAVE_DLOPEN
16.endif 22.endif
17.PATH: ${SSHDIST} 23.PATH: ${SSHDIST}
18 24
19.if (${USE_PAM} != "no") 25.if (${USE_PAM} != "no")
20CPPFLAGS+=-DUSE_PAM 26CPPFLAGS+=-DUSE_PAM
21.else # USE_PAM == no 27.else # USE_PAM == no
22.if (${USE_SKEY} != "no") 28.if (${USE_SKEY} != "no")
23CPPFLAGS+=-DSKEY 29CPPFLAGS+=-DSKEY
24.endif 30.endif
25.endif # USE_PAM == no 31.endif # USE_PAM == no