diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2003-05-19 15:52:01 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2003-05-19 15:52:01 +0000 |
| commit | 7691f66abfbcf43a14ca86b9875c01a31f101db3 (patch) | |
| tree | 9be45a94055cfc0506641b2e8790903643f53b99 /lib | |
| parent | e5b4d90497c3bc6ea11b2c72d76954fb60250da0 (diff) | |
Notes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 6 | ||||
| -rw-r--r-- | lib/libcrypt/Makefile | 2 | ||||
| -rw-r--r-- | lib/libfetch/Makefile | 2 | ||||
| -rw-r--r-- | lib/libpam/modules/modules.inc | 3 |
4 files changed, 5 insertions, 8 deletions
diff --git a/lib/Makefile b/lib/Makefile index 7312a9ea2cd6..d36a427ade90 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -79,13 +79,11 @@ _libdisk= libdisk .if defined(RELEASEDIR) || \ (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \ - defined(NOCRYPT) || defined(NO_OPENSSL) || \ - (defined(NOSECURE) && defined(NO_KERBEROS)) + defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NO_KERBEROS) _libtelnet= libtelnet .endif -.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) \ - && !defined(NOSECURE) +.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) _libmp= libmp .endif diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index ed4b2925171d..eda43f62017e 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -13,7 +13,7 @@ CFLAGS+= -I${.CURDIR}/../libmd -I${.CURDIR}/../libutil CFLAGS+= -DLIBC_SCCS -Wall # Pull in the crypt-des.c source, assuming it is present. .if exists(${.CURDIR}/../../secure/lib/libcrypt/crypt-des.c) && \ - !defined(NOSECURE) && !defined(NOCRYPT) + !defined(NOCRYPT) .PATH: ${.CURDIR}/../../secure/lib/libcrypt SRCS+= crypt-des.c crypt-blowfish.c blowfish.c CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile index 02c11f667dac..3f9ca1c618c1 100644 --- a/lib/libfetch/Makefile +++ b/lib/libfetch/Makefile @@ -9,7 +9,7 @@ INCS= fetch.h MAN= fetch.3 CLEANFILES= ftperr.h httperr.h -.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) CFLAGS+= -DWITH_SSL DPADD= ${LIBSSL} ${LIBCRYPTO} LDADD= -lssl -lcrypto diff --git a/lib/libpam/modules/modules.inc b/lib/libpam/modules/modules.inc index 3a54d3ce1073..c139818f8606 100644 --- a/lib/libpam/modules/modules.inc +++ b/lib/libpam/modules/modules.inc @@ -24,8 +24,7 @@ MODULES += pam_rhosts MODULES += pam_rootok MODULES += pam_securetty MODULES += pam_self -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) && \ - !defined(NOSECURE) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) MODULES += pam_ssh .endif MODULES += pam_tacplus |