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 /usr.bin | |
parent | 45f640e388df179b42641eb7ff526b05617cce21 (diff) | |
download | FreeBSD-src-0d1f47825b8bc213c9c4e1fdef06b1a35096446d.zip FreeBSD-src-0d1f47825b8bc213c9c4e1fdef06b1a35096446d.tar.gz |
Buildworld fixes for NO_OPENSSH and NO_OPENSSL
Approved by: jkh
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/passwd/Makefile | 2 | ||||
-rw-r--r-- | usr.bin/rlogin/Makefile | 2 | ||||
-rw-r--r-- | usr.bin/rsh/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
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- \ |