diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc index bd226bdeaef..b12aa04d5e8 100644 --- a/kerberos5/Makefile.inc +++ b/kerberos5/Makefile.inc @@ -13,8 +13,9 @@ ROKENDIR= ${.CURDIR}/../../lib/libroken CFLAGS+=-Wall -I${INCLUDEDIR} -I${INCLUDEOBJDIR} -DHAVE_CONFIG_H -.if defined(KRB5_KRB4_COMPAT) -CFLAGS+=-DKRB5_KRB4_COMPAT +.if defined(MAKE_KERBEROS4) && \ + (${MAKE_KERBEROS4} == "yes" || ${MAKE_KERBEROS4} == "yes") +CFLAGS+=-DKRB5_KRB4_COMPAT -DKRB4 .endif CFLAGS+=-DINET6 diff --git a/kerberos5/include/config.h b/kerberos5/include/config.h index f5c2d4603d6..8fad670470c 100644 --- a/kerberos5/include/config.h +++ b/kerberos5/include/config.h @@ -812,7 +812,7 @@ #define HAVE___ATTRIBUTE__ 1 /* Define if you have the krb4 package. */ -#define KRB4 1 +/* #define KRB4 1 */ /* define if krb_put_int takes four arguments. */ #define HAVE_FOUR_VALUED_KRB_PUT_INT 1 diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile index c8d02be7111..1a0a718b84f 100644 --- a/kerberos5/lib/Makefile +++ b/kerberos5/lib/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ -SUBDIR= libroken libasn1 libhdb libkrb5 libkafs5 libkadm5clnt libkadm5srv libsl - +SUBDIR= libroken libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl +.if defined(MAKE_KERBEROS4) +SUBDIR+=libkafs5 +.endif .include diff --git a/kerberos5/lib/libkafs5/Makefile b/kerberos5/lib/libkafs5/Makefile index 4f80a3eca6c..782800a70c6 100644 --- a/kerberos5/lib/libkafs5/Makefile +++ b/kerberos5/lib/libkafs5/Makefile @@ -8,7 +8,7 @@ CFLAGS+=-I${KRB5DIR}/lib/kafs \ -I${KRB5DIR}/include \ -I${KRB5OBJDIR} \ -I${ASN1OBJDIR} -SRCS= afssys.c afskrb.c afskrb5.c common.c +SRCS= afssys.c afskrb5.c common.c .include diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile index fb2cf226331..4a16d9dcea3 100644 --- a/kerberos5/libexec/hprop/Makefile +++ b/kerberos5/libexec/hprop/Makefile @@ -12,7 +12,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs -lkdb _krb4deps= ${LIBKRB} ${LIBKAFS} ${LIBKDB} .endif diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile index cb74c865bad..e30543ac0c9 100644 --- a/kerberos5/libexec/hpropd/Makefile +++ b/kerberos5/libexec/hpropd/Makefile @@ -12,11 +12,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs -lkdb _krb4deps= ${LIBKRB} ${LIBKAFS} ${LIBKDB} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \ diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile index 81c999eb465..dc0154bec08 100644 --- a/kerberos5/libexec/ipropd-master/Makefile +++ b/kerberos5/libexec/ipropd-master/Makefile @@ -12,11 +12,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile index 251533c45d3..900e778831a 100644 --- a/kerberos5/libexec/ipropd-slave/Makefile +++ b/kerberos5/libexec/ipropd-slave/Makefile @@ -12,11 +12,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err diff --git a/kerberos5/libexec/k5admind/Makefile b/kerberos5/libexec/k5admind/Makefile index 7e55664f186..f5bb9b15ffd 100644 --- a/kerberos5/libexec/k5admind/Makefile +++ b/kerberos5/libexec/k5admind/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= k5admind -SRCS= kadmind.c server.c version4.c \ +SRCS= kadmind.c server.c \ kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/lib/roken \ @@ -13,11 +13,12 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) +SRCS+= version4.c _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ -L${HDBOBJDIR} -lhdb \ diff --git a/kerberos5/libexec/k5passwdd/Makefile b/kerberos5/libexec/k5passwdd/Makefile index b15f95dca49..4ec263fe5ad 100644 --- a/kerberos5/libexec/k5passwdd/Makefile +++ b/kerberos5/libexec/k5passwdd/Makefile @@ -11,7 +11,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile index 7e55664f186..f5bb9b15ffd 100644 --- a/kerberos5/libexec/kadmind/Makefile +++ b/kerberos5/libexec/kadmind/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= k5admind -SRCS= kadmind.c server.c version4.c \ +SRCS= kadmind.c server.c \ kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/lib/roken \ @@ -13,11 +13,12 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) +SRCS+= version4.c _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ -L${HDBOBJDIR} -lhdb \ diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile index 4fae3aea4b2..96e3f2a0dae 100644 --- a/kerberos5/libexec/kdc/Makefile +++ b/kerberos5/libexec/kdc/Makefile @@ -13,11 +13,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs -_krb4deps= ${LIBKRB} ${LIBKAFS} ${LIBKDB} +_krb4deps= ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \ diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile index b15f95dca49..4ec263fe5ad 100644 --- a/kerberos5/libexec/kpasswdd/Makefile +++ b/kerberos5/libexec/kpasswdd/Makefile @@ -11,7 +11,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile index ec85d886e14..816f7114050 100644 --- a/kerberos5/usr.bin/Makefile +++ b/kerberos5/usr.bin/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR= k5admin k5auth k5destroy k5init k5list k5passwd +SUBDIR= k5admin k5destroy k5init k5list k5passwd .include diff --git a/kerberos5/usr.bin/k5admin/Makefile b/kerberos5/usr.bin/k5admin/Makefile index 04bbfbb9334..43cc5a53da4 100644 --- a/kerberos5/usr.bin/k5admin/Makefile +++ b/kerberos5/usr.bin/k5admin/Makefile @@ -15,11 +15,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ -L${HDBOBJDIR} -lhdb \ diff --git a/kerberos5/usr.bin/k5auth/Makefile b/kerberos5/usr.bin/k5auth/Makefile deleted file mode 100644 index 36e8426add5..00000000000 --- a/kerberos5/usr.bin/k5auth/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# $FreeBSD$ - -PROG= k5auth -SRCS= kauth.c rkinit.c encdata.c marshall.c roken.h -CFLAGS+= -I${KRB5DIR}/include \ - -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/appl/kauth \ - -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) -_krb4libs= -lkrb -lkafs -_krb4deps= ${LIBKRB} ${LIBKAFS} -.endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken ${_krb4libs} \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} -NOMAN= yes - -.include - -.PATH: ${KRB5DIR}/appl/kauth diff --git a/kerberos5/usr.bin/k5destroy/Makefile b/kerberos5/usr.bin/k5destroy/Makefile index 607d4c4511f..d8d9f3fdd91 100644 --- a/kerberos5/usr.bin/k5destroy/Makefile +++ b/kerberos5/usr.bin/k5destroy/Makefile @@ -9,11 +9,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ diff --git a/kerberos5/usr.bin/k5init/Makefile b/kerberos5/usr.bin/k5init/Makefile index 824b3a38f9d..4c5b4705771 100644 --- a/kerberos5/usr.bin/k5init/Makefile +++ b/kerberos5/usr.bin/k5init/Makefile @@ -9,11 +9,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) -_krb4libs= -lkrb -lkafs -_krb4deps= ${LIBKRB} ${LIBKAFS} +.if defined(MAKE_KERBEROS4) +_krb4libs= -L${KAFS5OBJDIR} -lkafs5 -lkrb -lkafs +_krb4deps= ${LIBKAFS5} ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ diff --git a/kerberos5/usr.bin/k5list/Makefile b/kerberos5/usr.bin/k5list/Makefile index b3798f42caf..6e2f0c19ce4 100644 --- a/kerberos5/usr.bin/k5list/Makefile +++ b/kerberos5/usr.bin/k5list/Makefile @@ -9,11 +9,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ diff --git a/kerberos5/usr.bin/k5passwd/Makefile b/kerberos5/usr.bin/k5passwd/Makefile index 9bd3e2d24fb..be2b77d1901 100644 --- a/kerberos5/usr.bin/k5passwd/Makefile +++ b/kerberos5/usr.bin/k5passwd/Makefile @@ -9,7 +9,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kpasswd \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile index 04bbfbb9334..43cc5a53da4 100644 --- a/kerberos5/usr.bin/kadmin/Makefile +++ b/kerberos5/usr.bin/kadmin/Makefile @@ -15,11 +15,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ -L${HDBOBJDIR} -lhdb \ diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile index 607d4c4511f..d8d9f3fdd91 100644 --- a/kerberos5/usr.bin/kdestroy/Makefile +++ b/kerberos5/usr.bin/kdestroy/Makefile @@ -9,11 +9,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile index 824b3a38f9d..4c5b4705771 100644 --- a/kerberos5/usr.bin/kinit/Makefile +++ b/kerberos5/usr.bin/kinit/Makefile @@ -9,11 +9,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) -_krb4libs= -lkrb -lkafs -_krb4deps= ${LIBKRB} ${LIBKAFS} +.if defined(MAKE_KERBEROS4) +_krb4libs= -L${KAFS5OBJDIR} -lkafs5 -lkrb -lkafs +_krb4deps= ${LIBKAFS5} ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ diff --git a/kerberos5/usr.bin/klist/Makefile b/kerberos5/usr.bin/klist/Makefile index b3798f42caf..6e2f0c19ce4 100644 --- a/kerberos5/usr.bin/klist/Makefile +++ b/kerberos5/usr.bin/klist/Makefile @@ -9,11 +9,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile index 9bd3e2d24fb..be2b77d1901 100644 --- a/kerberos5/usr.bin/kpasswd/Makefile +++ b/kerberos5/usr.bin/kpasswd/Makefile @@ -9,7 +9,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kpasswd \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/usr.sbin/k5stash/Makefile b/kerberos5/usr.sbin/k5stash/Makefile index 1e65bbb65e6..f5d5a67f3b3 100644 --- a/kerberos5/usr.sbin/k5stash/Makefile +++ b/kerberos5/usr.sbin/k5stash/Makefile @@ -11,11 +11,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile index 1e65bbb65e6..f5d5a67f3b3 100644 --- a/kerberos5/usr.sbin/kstash/Makefile +++ b/kerberos5/usr.sbin/kstash/Makefile @@ -11,11 +11,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile index 903afc8a4aa..87774f9a1a2 100644 --- a/kerberos5/usr.sbin/ktutil/Makefile +++ b/kerberos5/usr.sbin/ktutil/Makefile @@ -13,11 +13,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/admin \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -.if defined(KRB5_KRB4_COMPAT) +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken ${_krb4libs} \ -L${SLOBJDIR} -lsl -L${ASN1OBJDIR} -lasn1 \ -L${KADM5COBJDIR} -lkadm5clnt \