diff options
author | kris <kris@FreeBSD.org> | 2000-03-09 06:29:05 +0000 |
---|---|---|
committer | kris <kris@FreeBSD.org> | 2000-03-09 06:29:05 +0000 |
commit | 0d1f47825b8bc213c9c4e1fdef06b1a35096446d (patch) | |
tree | f1fa21cc8ddc4c376857a5866b4b4cb27002706c | |
parent | 45f640e388df179b42641eb7ff526b05617cce21 (diff) | |
download | FreeBSD-src-0d1f47825b8bc213c9c4e1fdef06b1a35096446d.zip FreeBSD-src-0d1f47825b8bc213c9c4e1fdef06b1a35096446d.tar.gz |
Buildworld fixes for NO_OPENSSH and NO_OPENSSL
Approved by: jkh
-rw-r--r-- | Makefile.inc1 | 6 | ||||
-rw-r--r-- | lib/Makefile | 2 | ||||
-rw-r--r-- | lib/libpam/libpam/Makefile | 6 | ||||
-rw-r--r-- | lib/libpam/modules/Makefile | 6 | ||||
-rw-r--r-- | secure/usr.bin/Makefile | 4 | ||||
-rw-r--r-- | usr.bin/passwd/Makefile | 2 | ||||
-rw-r--r-- | usr.bin/rlogin/Makefile | 2 | ||||
-rw-r--r-- | usr.bin/rsh/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/ppp/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/pppd/Makefile | 2 |
10 files changed, 17 insertions, 17 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 diff --git a/lib/Makefile b/lib/Makefile index 0492e70..357b0b0 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -43,7 +43,7 @@ _libbind= libbind .endif _libcrypt= libcrypt -.if exists(${.CURDIR}/../secure) && !defined(NOSECURE) && !defined(NOCRYPT) +.if exists(${.CURDIR}/../secure) && !defined(NOSECURE) && !defined(NOCRYPT) && !defined(NO_DESCRYPT) # Build both libraries. They have different names, so no harm, # and this avoids having stale libscrypt.* _libcrypt+= ../secure/lib/libcrypt diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile index c4cb0a4..4142380 100644 --- a/lib/libpam/libpam/Makefile +++ b/lib/libpam/libpam/Makefile @@ -62,16 +62,16 @@ HDRS3= pam_mod_misc.h # Static PAM modules: STATIC_MODULES+= ${MODOBJDIR}/pam_cleartext_pass_ok/libpam_cleartext_pass_ok.a STATIC_MODULES+= ${MODOBJDIR}/pam_deny/libpam_deny.a -.if defined(MAKE_KERBEROS4) && !defined(NOCRYPT) +.if defined(MAKE_KERBEROS4) && !defined(NOCRYPT) && !defined(NO_OPENSSL) STATIC_MODULES+= ${MODOBJDIR}/pam_kerberosIV/libpam_kerberosIV.a .endif -.if defined(MAKE_KERBEROS5__) && !defined(NOCRYPT) +.if defined(MAKE_KERBEROS5__) && !defined(NOCRYPT) && !defined(NO_OPENSSL) STATIC_MODULES+= ${MODOBJDIR}/pam_kerberos5/libpam_kerberos5.a .endif STATIC_MODULES+= ${MODOBJDIR}/pam_permit/libpam_permit.a STATIC_MODULES+= ${MODOBJDIR}/pam_radius/libpam_radius.a STATIC_MODULES+= ${MODOBJDIR}/pam_skey/libpam_skey.a -.if exists(${.CURDIR}/../../../crypto/openssh) && !defined(NO_OPENSSL) +.if exists(${.CURDIR}/../../../crypto/openssh) && !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) STATIC_MODULES+= ${MODOBJDIR}/pam_ssh/libpam_ssh.a .endif STATIC_MODULES+= ${MODOBJDIR}/pam_tacplus/libpam_tacplus.a diff --git a/lib/libpam/modules/Makefile b/lib/libpam/modules/Makefile index fec6b77..61eb0b4 100644 --- a/lib/libpam/modules/Makefile +++ b/lib/libpam/modules/Makefile @@ -26,16 +26,16 @@ SUBDIR+= pam_cleartext_pass_ok SUBDIR+= pam_deny -.if defined(MAKE_KERBEROS4) && !defined(NOCRYPT) +.if defined(MAKE_KERBEROS4) && !defined(NOCRYPT) && !defined(NO_OPENSSL) SUBDIR+= pam_kerberosIV .endif -.if defined(MAKE_KERBEROS5__) && !defined(NOCRYPT) +.if defined(MAKE_KERBEROS5__) && !defined(NOCRYPT) && !defined(NO_OPENSSL) SUBDIR+= pam_kerberos5 .endif SUBDIR+= pam_permit SUBDIR+= pam_radius SUBDIR+= pam_skey -.if exists(${.CURDIR}/../../../crypto/openssh) && !defined(NO_OPENSSL) +.if exists(${.CURDIR}/../../../crypto/openssh) && !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) SUBDIR+= pam_ssh .endif SUBDIR+= pam_tacplus diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile index 3d284da..fd67fd8 100644 --- a/secure/usr.bin/Makefile +++ b/secure/usr.bin/Makefile @@ -1,14 +1,14 @@ # $FreeBSD$ SUBDIR= bdes -.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5) SUBDIR+=telnet .endif .if !defined(NO_OPENSSL) SUBDIR+=openssl -.endif .if !defined(NO_OPENSSH) SUBDIR+=scp ssh ssh-add ssh-agent ssh-keygen .endif +.endif .include <bsd.subdir.mk> diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile index ac0abc8..4042f09 100644 --- a/usr.bin/passwd/Makefile +++ b/usr.bin/passwd/Makefile @@ -79,7 +79,7 @@ MAN1=passwd.1 LINKS=${BINDIR}/passwd ${BINDIR}/yppasswd MLINKS=passwd.1 yppasswd.1 -.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && (defined(MAKE_KERBEROS4)) +.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS4) SRCS+= kpasswd_standalone.c .PATH: ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \ ${.CURDIR}/../../usr.bin/rlogin ${.CURDIR}/../../usr.bin/passwd \ diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile index a0353db..9e61a6e 100644 --- a/usr.bin/rlogin/Makefile +++ b/usr.bin/rlogin/Makefile @@ -9,7 +9,7 @@ CFLAGS+=-I${.CURDIR}/../../libexec/rlogind BINMODE=4555 INSTALLFLAGS=-fschg -.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4) +.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT) SRCS+= krcmd.c kcmd.c rcmd_util.c DPADD= ${LIBUTIL} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \ diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile index ff6d61e..0cdb007 100644 --- a/usr.bin/rsh/Makefile +++ b/usr.bin/rsh/Makefile @@ -6,7 +6,7 @@ SRCS= rsh.c CFLAGS+=-Wall CFLAGS+=-I${.CURDIR}/../../libexec/rlogind -.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4) +.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT) SRCS+= krcmd.c kcmd.c rcmd_util.c CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \ -I${.CURDIR}/../rlogin -I${.CURDIR} -I- \ diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index 8d48088..349c3c2 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -33,7 +33,7 @@ DPADD+= ${LIBALIAS} .endif .endif -.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && !defined(RELEASE_CRUNCH) +.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) DISTRIBUTION=crypto CFLAGS+=-DHAVE_DES SRCS+= chap_ms.c diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile index 71b3832..7385f5d 100644 --- a/usr.sbin/pppd/Makefile +++ b/usr.sbin/pppd/Makefile @@ -28,7 +28,7 @@ LDADD+= -lpcap DPADD+= ${LIBPCAP} # MS-CHAP support. Requires the DES library. -.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && !defined(RELEASE_CRUNCH) +.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) DISTRIBUTION=crypto CFLAGS+=-DCHAPMS SRCS+= chap_ms.c |