mirror of
https://git.FreeBSD.org/src.git
synced 2024-11-28 08:02:54 +00:00
Properly separate the K5-only buld from K4.
Submitted by: sheldonh
This commit is contained in:
parent
25435b71b6
commit
00ffb9a030
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=58485
@ -14,7 +14,7 @@ ROKENDIR= ${.CURDIR}/../../lib/libroken
|
||||
CFLAGS+=-Wall -I${INCLUDEDIR} -I${INCLUDEOBJDIR} -DHAVE_CONFIG_H
|
||||
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "yes" || ${MAKE_KERBEROS4} == "yes")
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
CFLAGS+=-DKRB5_KRB4_COMPAT -DKRB4
|
||||
.endif
|
||||
|
||||
|
@ -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>
|
||||
|
@ -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
|
||||
|
@ -12,7 +12,8 @@ CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${HDBOBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
_krb4libs= -lkrb -lkafs -lkdb
|
||||
_krb4deps= ${LIBKRB} ${LIBKAFS} ${LIBKDB}
|
||||
.endif
|
||||
|
@ -12,7 +12,8 @@ CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${HDBOBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
_krb4libs= -lkrb -lkafs -lkdb
|
||||
_krb4deps= ${LIBKRB} ${LIBKAFS} ${LIBKDB}
|
||||
.endif
|
||||
|
@ -12,7 +12,8 @@ CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${HDBOBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
_krb4libs= -lkrb -lkafs
|
||||
_krb4deps= ${LIBKRB} ${LIBKAFS}
|
||||
.endif
|
||||
|
@ -12,7 +12,8 @@ CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${HDBOBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
_krb4libs= -lkrb -lkafs
|
||||
_krb4deps= ${LIBKRB} ${LIBKAFS}
|
||||
.endif
|
||||
|
@ -13,7 +13,8 @@ CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${HDBOBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
SRCS+= version4.c
|
||||
_krb4libs= -lkrb -lkafs
|
||||
_krb4deps= ${LIBKRB} ${LIBKAFS}
|
||||
|
@ -11,7 +11,8 @@ CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${HDBOBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
_krb4libs= -lkrb -lkafs
|
||||
_krb4deps= ${LIBKRB} ${LIBKAFS}
|
||||
.endif
|
||||
|
@ -13,7 +13,8 @@ CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${HDBOBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
SRCS+= version4.c
|
||||
_krb4libs= -lkrb -lkafs
|
||||
_krb4deps= ${LIBKRB} ${LIBKAFS}
|
||||
|
@ -13,7 +13,8 @@ CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${HDBOBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
_krb4libs= -lkrb -lkafs
|
||||
_krb4deps= ${LIBKRB} ${LIBKAFS}
|
||||
.endif
|
||||
|
@ -11,7 +11,8 @@ CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${HDBOBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
_krb4libs= -lkrb -lkafs
|
||||
_krb4deps= ${LIBKRB} ${LIBKAFS}
|
||||
.endif
|
||||
|
@ -15,7 +15,8 @@ CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${HDBOBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
_krb4libs= -lkrb -lkafs
|
||||
_krb4deps= ${LIBKRB} ${LIBKAFS}
|
||||
.endif
|
||||
|
@ -4,12 +4,14 @@ PROG= k5destroy
|
||||
SRCS= kdestroy.c krb5_err.h heim_err.h
|
||||
CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${KRB5DIR}/lib/roken \
|
||||
-I${KRB5DIR}/lib/kafs \
|
||||
-I${KRB5DIR}/lib/krb5 \
|
||||
-I${KRB5DIR}/lib/asn1 \
|
||||
-I${KRB5DIR}/kuser \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
_krb4libs= -lkrb -lkafs
|
||||
_krb4deps= ${LIBKRB} ${LIBKAFS}
|
||||
.endif
|
||||
|
@ -4,12 +4,14 @@ PROG= k5init
|
||||
SRCS= kinit.c kinit_options.c asn1_err.h krb5_err.h heim_err.h
|
||||
CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${KRB5DIR}/lib/roken \
|
||||
-I${KRB5DIR}/lib/kafs \
|
||||
-I${KRB5DIR}/lib/krb5 \
|
||||
-I${KRB5DIR}/lib/asn1 \
|
||||
-I${KRB5DIR}/kuser \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
_krb4libs= -L${KAFS5OBJDIR} -lkafs5 -lkrb -lkafs
|
||||
_krb4deps= ${LIBKAFS5} ${LIBKRB} ${LIBKAFS}
|
||||
.endif
|
||||
|
@ -4,12 +4,14 @@ PROG= k5list
|
||||
SRCS= klist.c krb5_err.h heim_err.h
|
||||
CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${KRB5DIR}/lib/roken \
|
||||
-I${KRB5DIR}/lib/kafs \
|
||||
-I${KRB5DIR}/lib/krb5 \
|
||||
-I${KRB5DIR}/lib/asn1 \
|
||||
-I${KRB5DIR}/kuser \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
_krb4libs= -lkrb -lkafs
|
||||
_krb4deps= ${LIBKRB} ${LIBKAFS}
|
||||
.endif
|
||||
|
@ -9,7 +9,8 @@ CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${KRB5DIR}/kpasswd \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
_krb4libs= -lkrb -lkafs
|
||||
_krb4deps= ${LIBKRB} ${LIBKAFS}
|
||||
.endif
|
||||
|
@ -15,7 +15,8 @@ CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${HDBOBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
_krb4libs= -lkrb -lkafs
|
||||
_krb4deps= ${LIBKRB} ${LIBKAFS}
|
||||
.endif
|
||||
|
@ -4,12 +4,14 @@ PROG= k5destroy
|
||||
SRCS= kdestroy.c krb5_err.h heim_err.h
|
||||
CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${KRB5DIR}/lib/roken \
|
||||
-I${KRB5DIR}/lib/kafs \
|
||||
-I${KRB5DIR}/lib/krb5 \
|
||||
-I${KRB5DIR}/lib/asn1 \
|
||||
-I${KRB5DIR}/kuser \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
_krb4libs= -lkrb -lkafs
|
||||
_krb4deps= ${LIBKRB} ${LIBKAFS}
|
||||
.endif
|
||||
|
@ -4,12 +4,14 @@ PROG= k5init
|
||||
SRCS= kinit.c kinit_options.c asn1_err.h krb5_err.h heim_err.h
|
||||
CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${KRB5DIR}/lib/roken \
|
||||
-I${KRB5DIR}/lib/kafs \
|
||||
-I${KRB5DIR}/lib/krb5 \
|
||||
-I${KRB5DIR}/lib/asn1 \
|
||||
-I${KRB5DIR}/kuser \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
_krb4libs= -L${KAFS5OBJDIR} -lkafs5 -lkrb -lkafs
|
||||
_krb4deps= ${LIBKAFS5} ${LIBKRB} ${LIBKAFS}
|
||||
.endif
|
||||
|
@ -4,12 +4,14 @@ PROG= k5list
|
||||
SRCS= klist.c krb5_err.h heim_err.h
|
||||
CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${KRB5DIR}/lib/roken \
|
||||
-I${KRB5DIR}/lib/kafs \
|
||||
-I${KRB5DIR}/lib/krb5 \
|
||||
-I${KRB5DIR}/lib/asn1 \
|
||||
-I${KRB5DIR}/kuser \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
_krb4libs= -lkrb -lkafs
|
||||
_krb4deps= ${LIBKRB} ${LIBKAFS}
|
||||
.endif
|
||||
|
@ -9,7 +9,8 @@ CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${KRB5DIR}/kpasswd \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
_krb4libs= -lkrb -lkafs
|
||||
_krb4deps= ${LIBKRB} ${LIBKAFS}
|
||||
.endif
|
||||
|
@ -11,7 +11,8 @@ CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${HDBOBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
_krb4libs= -lkrb -lkafs
|
||||
_krb4deps= ${LIBKRB} ${LIBKAFS}
|
||||
.endif
|
||||
|
@ -11,7 +11,8 @@ CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${HDBOBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
_krb4libs= -lkrb -lkafs
|
||||
_krb4deps= ${LIBKRB} ${LIBKAFS}
|
||||
.endif
|
||||
|
@ -13,7 +13,8 @@ CFLAGS+= -I${KRB5DIR}/include \
|
||||
-I${KRB5DIR}/admin \
|
||||
-I${ASN1OBJDIR} \
|
||||
-I${.OBJDIR}
|
||||
.if defined(MAKE_KERBEROS4)
|
||||
.if defined(MAKE_KERBEROS4) && \
|
||||
(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
|
||||
_krb4libs= -lkrb -lkafs
|
||||
_krb4deps= ${LIBKRB} ${LIBKAFS}
|
||||
.endif
|
||||
|
Loading…
Reference in New Issue
Block a user