cvs commit: src/kerberos5/libexec/hprop Makefile

[Peter Pentchev]

On Mon, Jan 17, 2005 at 05:35:38PM +0000, Robert Watson <rwatson at FreeBSD.org> wrote:
> rwatson     2005-01-17 17:35:38 UTC
> 
>   FreeBSD src repository
> 
>   Modified files:        (Branch: RELENG_4)
>     kerberos5/libexec/hprop Makefile 
>   Log:
>   When building hprop, add ${KRB5DIR}/lib to the include path, as the
>   mit_dump.c expects to be able to include krb5/admin.h.
>   
>   Revision  Changes    Path
>   1.3.2.4   +1 -0      src/kerberos5/libexec/hprop/Makefile

This seems to have broken my krb4-less build, since libkafs5 is only
built with Kerberos 4 according to src/kerberos5/lib/Makefile.  Here's a
patch that moves the kafs5 library within the MAKE_KERBEROS4
conditional, and it seems to work for me.  I could commit it if it looks
correct to you.

G'luck,
Peter

Index: src/kerberos5/libexec/hprop/Makefile
===================================================================
RCS file: /home/ncvs/src/kerberos5/libexec/hprop/Makefile,v
retrieving revision 1.3.2.4
diff -u -r1.3.2.4 Makefile
--- src/kerberos5/libexec/hprop/Makefile	17 Jan 2005 17:35:38 -0000	1.3.2.4
+++ src/kerberos5/libexec/hprop/Makefile	18 Jan 2005 09:32:53 -0000
@@ -14,15 +14,15 @@
 		-I${HDBOBJDIR} \
 		-I${.OBJDIR}
 .if defined(MAKE_KERBEROS4)
-_krb4libs=	-lkrb -lkafs -lkdb
-_krb4deps=	${LIBKRB} ${LIBKAFS} ${LIBKDB}
+_krb4libs=	-lkrb -lkafs -lkdb -L${KAFS5OBJDIR} -lkafs5
+_krb4deps=	${LIBKRB} ${LIBKAFS} ${LIBKDB} ${LIBKAFS5}
 .endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
+LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \
 		-L${VERSOBJDIR} -lvers \
 		${_krb4libs} \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
+DPADD=		${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
 		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 MAN=		hprop.8
 

-- 
Peter Pentchev	roam at ringlet.net    roam at cnsys.bg    roam at FreeBSD.org
PGP key:	http://people.FreeBSD.org/~roam/roam.key.asc
Key fingerprint	FDBA FD79 C26F 3C51 C95E  DF9E ED18 B68D 1619 4553
What would this sentence be like if pi were 3?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-src/attachments/20050118/68753373/attachment.bin