d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak world build if NO_OPENSSL is defined but NO_KERBEROS is not.

Browse Source 
Submitted by:	Marius Strobl <marius@alchemy.franken.de>
Approved by:	re (jhb)
This commit is contained in:
Ruslan Ermilov 2003-05-21 21:47:20 +00:00
parent 5da30ee2ba
commit a0218a2a4d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=115219
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.inc1
View File

@ -695,7 +695,7 @@ _fortran= gnu/usr.bin/cc/f771
.endif
.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
!defined(NOCRYPT) && !defined(NO_KERBEROS)
!defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS)
_libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \
kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl
.endif
@ -782,7 +782,8 @@ _prebuild_libs=
_generic_libs= gnu/lib
.if !defined(NOCRYPT) && !defined(NO_KERBEROS)
.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
!defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS)
_prebuild_libs+= kerberos5/lib/libasn1
_prebuild_libs+= kerberos5/lib/libgssapi
_prebuild_libs+= kerberos5/lib/libkrb5

3
share/examples/etc/make.conf
View File

@ -113,7 +113,8 @@
#NO_MODULES= true # do not build modules with the kernel
#NO_OBJC= true # do not build Objective C support
#NO_OPENSSH= true # do not build OpenSSH
#NO_OPENSSL= true # do not build OpenSSL (implies NO_OPENSSH)
#NO_OPENSSL= true # do not build OpenSSL (implies NO_KERBEROS and
# NO_OPENSSH)
#NO_SENDMAIL= true # do not build sendmail and related programs
#NO_SHAREDOCS= true # do not build the 4.4BSD legacy docs
#NO_TCSH= true # do not build and install /bin/csh (which is tcsh)

2
share/man/man5/make.conf.5
View File

@ -481,6 +481,8 @@ Set to not build OpenSSH.
.It Va NO_OPENSSL
.Pq Vt bool
Set to not build OpenSSL (implies
.Va NO_KERBEROS
and
.Va NO_OPENSSH ) .
.It Va NO_SENDMAIL
.Pq Vt bool