diff options
| author | markm <markm@FreeBSD.org> | 2000-03-23 14:56:47 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2000-03-23 14:56:47 +0000 |
| commit | c1ba294b4dc4c06a5a3eb30dd42de5407256f522 (patch) | |
| tree | 83d68d7658e08e3e7d56dae4e21c5e4c788457a8 /kerberos5/lib | |
| parent | a0e94fcb09894a5e29c41807097db8dda464c432 (diff) | |
| download | FreeBSD-src-c1ba294b4dc4c06a5a3eb30dd42de5407256f522.zip FreeBSD-src-c1ba294b4dc4c06a5a3eb30dd42de5407256f522.tar.gz | |
Properly separate the K5-only buld from K4.
Submitted by: sheldonh
Diffstat (limited to 'kerberos5/lib')
| -rw-r--r-- | kerberos5/lib/Makefile | 3 | ||||
| -rw-r--r-- | kerberos5/lib/libkrb5/Makefile | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile index 1a0a718..76c8b39 100644 --- a/kerberos5/lib/Makefile +++ b/kerberos5/lib/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ SUBDIR= libroken libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl -.if defined(MAKE_KERBEROS4) +.if defined(MAKE_KERBEROS4) && \ + (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") SUBDIR+=libkafs5 .endif .include <bsd.subdir.mk> diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile index 59469d8..4d09cdb 100644 --- a/kerberos5/lib/libkrb5/Makefile +++ b/kerberos5/lib/libkrb5/Makefile @@ -8,6 +8,10 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/include \ -I${KRB5OBJDIR} \ -I${ASN1OBJDIR} +.if defined(MAKE_KERBEROS4) && \ + (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +CFLAGS+=-I${KRB4DIR}/include +.endif SRCS= add_et_list.c addr_families.c address.c aname_to_localname.c \ asn1_glue.c auth_context.c build_ap_req.c build_auth.c \ cache.c changepw.c codec.c config_file.c config_file_netinfo.c \ @@ -19,7 +23,7 @@ SRCS= add_et_list.c addr_families.c address.c aname_to_localname.c \ get_in_tkt.c get_in_tkt_pw.c get_in_tkt_with_keytab.c \ get_in_tkt_with_skey.c get_port.c init_creds.c init_creds_pw.c \ keyblock.c keytab.c keytab_file.c keytab_memory.c \ - keytab_krb4.c keytab_keyfile.c krbhst.c kuserok.c log.c \ + keytab_keyfile.c krbhst.c kuserok.c log.c \ mcache.c misc.c mk_error.c mk_priv.c mk_rep.c mk_req.c \ mk_req_ext.c mk_safe.c net_read.c net_write.c n-fold.c \ padata.c principal.c prog_setup.c prompter_posix.c \ @@ -30,6 +34,10 @@ SRCS= add_et_list.c addr_families.c address.c aname_to_localname.c \ verify_init.c verify_user.c version.c warn.c write_message.c \ krb5_err.c krb5_err.h heim_err.c heim_err.h \ rc4_enc.c rc4_skey.c +.if defined(MAKE_KERBEROS4) && \ + (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +SRCS+= keytab_krb4.c +.endif INCLUDES=${KRB5DIR}/lib/krb5/krb5.h ${.CURDIR}/../../include/krb5-types.h \ ${KRB5DIR}/lib/krb5/krb5-protos.h heim_err.h krb5_err.h |
