summaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorkris <kris@FreeBSD.org>2000-03-09 06:29:05 +0000
committerkris <kris@FreeBSD.org>2000-03-09 06:29:05 +0000
commit0d1f47825b8bc213c9c4e1fdef06b1a35096446d (patch)
treef1fa21cc8ddc4c376857a5866b4b4cb27002706c /Makefile.inc1
parent45f640e388df179b42641eb7ff526b05617cce21 (diff)
downloadFreeBSD-src-0d1f47825b8bc213c9c4e1fdef06b1a35096446d.zip
FreeBSD-src-0d1f47825b8bc213c9c4e1fdef06b1a35096446d.tar.gz
Buildworld fixes for NO_OPENSSH and NO_OPENSSL
Approved by: jkh
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc16
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 2b34f91..95bac4e 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -57,11 +57,11 @@ SUBDIR+= games
SUBDIR+= gnu
.endif
.if exists(${.CURDIR}/kerberosIV) && exists(${.CURDIR}/crypto) && \
- !defined(NOCRYPT) && defined(MAKE_KERBEROS4)
+ !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS4)
SUBDIR+= kerberosIV
.endif
.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
- !defined(NOCRYPT) && defined(MAKE_KERBEROS5)
+ !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS5)
SUBDIR+= kerberos5
.endif
.if exists(${.CURDIR}/libexec)
@@ -203,7 +203,7 @@ INCDIRS= arpa g++/std objc protocols readline rpc rpcsvc openssl \
# success, regardless of how old your existing system is.
#
buildworld:
-.if !defined(NOSECURE) && exists(${.CURDIR}/secure) && \
+.if !defined(NOSECURE) && !defined(NO_OPENSSL) && exists(${.CURDIR}/secure) && \
(!defined(USA_RESIDENT) || (${USA_RESIDENT} != NO && \
${USA_RESIDENT} != YES))
@echo
OpenPOWER on IntegriCloud