diff options
| author | markm <markm@FreeBSD.org> | 2003-05-05 07:58:44 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2003-05-05 07:58:44 +0000 |
| commit | ee63e7dc15cc9a4f4ef4c40ed7ae743aa0706003 (patch) | |
| tree | 56d309156db9452465ff78724b6b4c3a6e0cbcba /secure | |
| parent | a7d933895cee5d8535b76f436f05f14decfd5967 (diff) | |
| download | FreeBSD-src-ee63e7dc15cc9a4f4ef4c40ed7ae743aa0706003.zip FreeBSD-src-ee63e7dc15cc9a4f4ef4c40ed7ae743aa0706003.tar.gz | |
Turn MAKE_KERBEROS5 into NO_KERBEROS by negating the logic. Some extra
cleanups were necessary in release/Makefile, and the tinderbox code
was syntax checked, not run checked.
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/lib/Makefile | 2 | ||||
| -rw-r--r-- | secure/lib/libssh/Makefile | 2 | ||||
| -rw-r--r-- | secure/libexec/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.bin/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.bin/ssh/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.sbin/sshd/Makefile | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/secure/lib/Makefile b/secure/lib/Makefile index 9c8856d..16aff1a 100644 --- a/secure/lib/Makefile +++ b/secure/lib/Makefile @@ -6,7 +6,7 @@ SUBDIR+=libcrypto libssl .if !defined(NO_OPENSSH) SUBDIR+=libssh .endif -.if !defined(MAKE_KERBEROS5) +.if defined(NO_KERBEROS) SUBDIR+=libtelnet .endif .endif diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 6415f58..290744a 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -19,7 +19,7 @@ SRCS+= getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c .endif CFLAGS+= -I${SSHDIR} -.if defined(MAKE_KERBEROS5) +.if !defined(NO_KERBEROS) CFLAGS+= -DKRB5 -DHEIMDAL .endif diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile index 5a3f79d..56d09b7 100644 --- a/secure/libexec/Makefile +++ b/secure/libexec/Makefile @@ -5,7 +5,7 @@ SUBDIR= .if !defined(NO_OPENSSH) SUBDIR+=sftp-server ssh-keysign .endif -.if !defined(MAKE_KERBEROS5) +.if defined(NO_KERBEROS) SUBDIR+=telnetd .endif .endif diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile index a6bf02b..791c8c5 100644 --- a/secure/usr.bin/Makefile +++ b/secure/usr.bin/Makefile @@ -6,7 +6,7 @@ SUBDIR+=openssl .if !defined(NO_OPENSSH) SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan .endif -.if !defined(MAKE_KERBEROS5) +.if defined(NO_KERBEROS) SUBDIR+=telnet .endif .endif diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index b87cdca..d79f44f 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -10,7 +10,7 @@ MLINKS= ssh.1 slogin.1 SRCS= ssh.c authfd.c hostfile.c msg.c readconf.c clientloop.c sshtty.c \ sshconnect.c sshconnect1.c sshconnect2.c -.if defined(MAKE_KERBEROS5) +.if !defined(NO_KERBEROS) CFLAGS+= -DKRB5 -DHEIMDAL LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken -lcrypt DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD} ${LIBCRYPT} diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index faa0c88..dc10924 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -16,7 +16,7 @@ SRCS+= loginrec.c MAN= sshd.8 sshd_config.5 CFLAGS+=-I${SSHDIR} -.if defined(MAKE_KERBEROS5) +.if !defined(NO_KERBEROS) CFLAGS+= -DKRB5 -DHEIMDAL SRCS+= auth-krb5.c LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken |
