diff options
| author | ru <ru@FreeBSD.org> | 2003-05-21 21:47:20 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2003-05-21 21:47:20 +0000 |
| commit | 27a4bbdd92fe31333a9eb3aa3b59c619cb24f3c2 (patch) | |
| tree | cde309d68197c42f9d3235b9fe71dba39c1c6f96 | |
| parent | 55ee04e5a0535297dc56dbec45a2879da9538a04 (diff) | |
| download | FreeBSD-src-27a4bbdd92fe31333a9eb3aa3b59c619cb24f3c2.zip FreeBSD-src-27a4bbdd92fe31333a9eb3aa3b59c619cb24f3c2.tar.gz | |
Unbreak world build if NO_OPENSSL is defined but NO_KERBEROS is not.
Submitted by: Marius Strobl <marius@alchemy.franken.de>
Approved by: re (jhb)
| -rw-r--r-- | Makefile.inc1 | 5 | ||||
| -rw-r--r-- | share/examples/etc/make.conf | 3 | ||||
| -rw-r--r-- | share/man/man5/make.conf.5 | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index b0cba4c..e3ab806 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index bc8bbba..8a26d2b 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -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) diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 09ba2916..fbde9f0 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -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 |
