Only #define HAVE_IPV6 if ${USE_INET6} != "no".

2005-01-10 03:11:17 +00:00 · 2005-01-10 03:11:17 +00:00 · 1e281ed227
parent a390dfa659
commit 1e281ed227
33 changed files with 165 additions and 32 deletions
--- a/include/heimdal/config.h
+++ b/include/heimdal/config.h
@ -394,7 +394,9 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 /* #undef HAVE_IO_H */

 /* Define if you have IPv6. */
+#if 0	/* We'll define this in each Makefile as necessary */
 #define HAVE_IPV6 1
+#endif

 /* Define if you have the function `iruserok'. */
 #define HAVE_IRUSEROK 1
--- a/lib/libasn1/Makefile
+++ b/lib/libasn1/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/07/12 20:44:56 jonathan Exp $
+# $NetBSD: Makefile,v 1.25 2005/01/10 03:11:17 lukem Exp $

 NOLINT=		# defined

@ -108,6 +108,10 @@ CPPFLAGS+= -I.					\
 	 -I${DIST}/heimdal/lib/com_err		\
 	 -DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 ${gen_files} krb5_asn1.hx: asn1_files

 asn1_files: k5.asn1 ${TOOL_ASN1_COMPILE}
--- a/lib/libasn1/asn1_compile/Makefile
+++ b/lib/libasn1/asn1_compile/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/09/13 17:29:56 thorpej Exp $
+# $NetBSD: Makefile,v 1.19 2005/01/10 03:11:17 lukem Exp $

 NOLINT=		# defined
 NOMAN=		# defined
@ -49,6 +49,10 @@ HOST_CPPFLAGS+= -I.				\
 	 -DKRB5=1				\
 	 -DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+HOST_CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 DPSRCS=		print_version.h

 make-print-version.lo: ${NETBSDSRCDIR}/include/heimdal/version.h
--- a/lib/libcom_err/Makefile
+++ b/lib/libcom_err/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/08/19 09:41:29 lukem Exp $
+# $NetBSD: Makefile,v 1.13 2005/01/10 03:11:17 lukem Exp $

 NOLINT=		# defined

@ -38,6 +38,10 @@ CPPFLAGS+= -I.					\
 	 -I${DIST}/heimdal/lib/roken		\
 	 -DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 .include <bsd.lib.mk>
 .if ${USETOOLS} != "yes"
 .include <bsd.subdir.mk>
--- a/lib/libcom_err/compile_et/Makefile
+++ b/lib/libcom_err/compile_et/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/09/13 18:30:43 thorpej Exp $
+# $NetBSD: Makefile,v 1.16 2005/01/10 03:11:17 lukem Exp $

 NOMAN=		# defined

@ -27,6 +27,10 @@ HOST_CPPFLAGS+= -I.				\
 	 -DKRB4=1 -DKRB5=1			\
 	 -DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+HOST_CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 DPSRCS=		print_version.h

 make-print-version.lo: ${NETBSDSRCDIR}/include/heimdal/version.h
--- a/lib/libgssapi/Makefile
+++ b/lib/libgssapi/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/04/02 14:59:48 lha Exp $
+# $NetBSD: Makefile,v 1.14 2005/01/10 03:11:17 lukem Exp $

 NOLINT=		# defined

@ -121,4 +121,8 @@ CPPFLAGS+= -I.					\
 	 -I${DIST}/heimdal/lib/roken		\
 	 -DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 .include <bsd.lib.mk>
--- a/lib/libhdb/Makefile
+++ b/lib/libhdb/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/07/10 10:34:23 lukem Exp $
+# $NetBSD: Makefile,v 1.18 2005/01/10 03:11:17 lukem Exp $

 NOLINT=		# defined

@ -64,6 +64,10 @@ CPPFLAGS+= -I.					\
 	 -I${DIST}/heimdal/lib/roken		\
 	 -DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 ${gen_files} hdb_asn1.h: asn1_files

 hdb_asn1.h: hdb_asn1.hx
--- a/lib/libkadm/Makefile
+++ b/lib/libkadm/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/07/10 10:34:23 lukem Exp $
+# $NetBSD: Makefile,v 1.15 2005/01/10 03:11:17 lukem Exp $

 NOLINT=		# defined

@ -45,6 +45,10 @@ CPPFLAGS+= -I.					\
 	-I${DIST}/heimdal/lib/roken		\
 	-DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 CLEANFILES=	${ERR_FILES} kadm_err.h

 ${SRCS:.c=.o}: kadm_err.h
--- a/lib/libkadm5clnt/Makefile
+++ b/lib/libkadm5clnt/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/07/10 10:34:23 lukem Exp $
+# $NetBSD: Makefile,v 1.19 2005/01/10 03:11:17 lukem Exp $

 NOLINT=		# defined

@ -64,6 +64,10 @@ CPPFLAGS+= -I.					\
 	 -I${DIST}/heimdal/lib/roken		\
 	 -DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 ${SRCS:.c=.o}: kadm5_err.h

 CLEANFILES=	kadm5_err.h kadm5_err.c
--- a/lib/libkadm5srv/Makefile
+++ b/lib/libkadm5srv/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/08/01 17:03:58 lukem Exp $
+# $NetBSD: Makefile,v 1.23 2005/01/10 03:11:17 lukem Exp $

 NOLINT=		# defined

@ -85,6 +85,10 @@ CPPFLAGS+= -I.					\
 	 -I${DIST}/heimdal/lib/roken		\
 	 -DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 .if ${MKPIC} == "no"
 CPPFLAGS+=	-DNO_DLOPEN
 .endif
--- a/lib/libkafs/Makefile
+++ b/lib/libkafs/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/23 08:01:43 itojun Exp $
+# $NetBSD: Makefile,v 1.8 2005/01/10 03:11:17 lukem Exp $

 NOLINT=		# defined

@ -31,8 +31,13 @@ CPPFLAGS+= -I.					\
 	-I${NETBSDSRCDIR}/libroken		\
 	-I${DIST}/heimdal/lib/roken		\
 	-DHAVE_CONFIG_H
+
 .if ${MKKERBEROS4} != "no"
 CPPFLAGS+=-DKRB4
 .endif

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 .include <bsd.lib.mk>
--- a/lib/libkdb/Makefile
+++ b/lib/libkdb/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/08/29 01:31:31 itojun Exp $
+# $NetBSD: Makefile,v 1.8 2005/01/10 03:11:17 lukem Exp $

 NOLINT=		# defined

@ -28,4 +28,8 @@ CPPFLAGS+= -I.					\
 	-I${DIST}/heimdal/lib/roken		\
 	-DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 .include <bsd.lib.mk>
--- a/lib/libkrb/Makefile
+++ b/lib/libkrb/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/08/05 01:24:02 lukem Exp $
+# $NetBSD: Makefile,v 1.31 2005/01/10 03:11:17 lukem Exp $

 NOLINT=		# defined

@ -129,6 +129,10 @@ CPPFLAGS+= -I.					\
 	-I${DIST}/heimdal/lib/roken		\
 	-DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 CLEANFILES=	${ERR_FILES} krb_err.h krb.h

 krb.h:	krb.h.in
--- a/lib/libkrb5/Makefile
+++ b/lib/libkrb5/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2004/08/05 01:24:02 lukem Exp $
+# $NetBSD: Makefile,v 1.34 2005/01/10 03:11:17 lukem Exp $

 NOLINT=		# defined

@ -357,6 +357,10 @@ CPPFLAGS+= -I.					\
 	 -I${DIST}/heimdal/lib/roken		\
 	 -DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 CLEANFILES=	${ERR_FILES} krb5_err.h heim_err.h k524_err.h

 ${SRCS:.c=.o}: krb5_err.h heim_err.h k524_err.h
--- a/lib/libroken/Makefile
+++ b/lib/libroken/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/08/19 09:41:34 lukem Exp $
+# $NetBSD: Makefile,v 1.13 2005/01/10 03:11:17 lukem Exp $

 NOLINT=		# defined

@ -66,6 +66,10 @@ CPPFLAGS+= -I. \
 	-I${DIST}/heimdal/lib/roken \
 	-DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 HOST_CPPFLAGS+=	-I${NETBSDSRCDIR}/include/heimdal -DHAVE_CONFIG_H

 .include <bsd.lib.mk>
--- a/lib/libsl/Makefile
+++ b/lib/libsl/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/08/19 09:41:34 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2005/01/10 03:11:17 lukem Exp $

 NOLINT=		# defined

@ -19,4 +19,8 @@ CPPFLAGS+= -I.					\
 	 -I${DIST}/heimdal/lib/roken		\
 	 -DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 .include <bsd.lib.mk>
--- a/lib/libss/Makefile
+++ b/lib/libss/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/08/19 09:41:34 lukem Exp $
+# $NetBSD: Makefile,v 1.5 2005/01/10 03:11:17 lukem Exp $

 NOLINT=		# defined

@ -23,4 +23,8 @@ CPPFLAGS+= -I. \
 	 -I${DIST}/heimdal/lib/roken		\
 	 -DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 .include <bsd.lib.mk>
--- a/lib/libvers/Makefile
+++ b/lib/libvers/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/08/19 09:41:35 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2005/01/10 03:11:17 lukem Exp $

 NOLINKLIB=	# defined
 NOPIC=		# defined
@ -25,6 +25,11 @@ CPPFLAGS+= -I. \
 
 HOST_CPPFLAGS+=	-I${NETBSDSRCDIR}/include/heimdal -DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+HOST_CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 make-print-version.lo: ${NETBSDSRCDIR}/include/heimdal/version.h

 make-print-version: make-print-version.lo
--- a/libexec/hpropd/Makefile
+++ b/libexec/hpropd/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/08/18 07:23:45 lha Exp $
+# $NetBSD: Makefile,v 1.13 2005/01/10 03:11:17 lukem Exp $

 NOLINT=		# defined

@ -27,6 +27,10 @@ CPPFLAGS+= -I.					\
 	-I${DESTDIR}/usr/include/krb5		\
 	-DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 VERS!=		cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}

 LDADD+=		-lhdb -lkrb5 ${KRB4LDADD} -lcrypto \
--- a/libexec/kadmind/Makefile
+++ b/libexec/kadmind/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/08/23 23:03:42 lha Exp $
+# $NetBSD: Makefile,v 1.16 2005/01/10 03:11:18 lukem Exp $

 NOLINT=		# defined

@ -34,6 +34,10 @@ CPPFLAGS+= -I.					\
 	-I${DESTDIR}/usr/include/krb5		\
 	-DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 VERS!=		cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}

 LDADD+=		-lkadm5srv -lhdb -lkrb5 ${KRB4LDADD} \
--- a/libexec/kpasswdd/Makefile
+++ b/libexec/kpasswdd/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/10/23 01:06:11 itojun Exp $
+# $NetBSD: Makefile,v 1.13 2005/01/10 03:11:18 lukem Exp $

 NOLINT=		# defined

@ -19,6 +19,10 @@ CPPFLAGS+= -I.					\
 	-I${DESTDIR}/usr/include/krb5		\
 	-DHAVE_CONFIG_H -DINETD_SUPPORT

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 VERS!=		cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}

 LDADD+=		-lkadm5srv -lhdb -lkrb5 -lcrypto -lasn1 \
--- a/usr.bin/compile_et/Makefile
+++ b/usr.bin/compile_et/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/06/22 02:44:11 jmc Exp $
+# $NetBSD: Makefile,v 1.16 2005/01/10 03:11:18 lukem Exp $

 NOLINT= # defined

@ -18,11 +18,16 @@ YHEADER=	1
 CPPFLAGS+= -I.					\
 	-I${DIST}/heimdal/lib/com_err		\
 	-I${NETBSDSRCDIR}/include/heimdal	
+
 .ifndef HOSTPROG
 CPPFLAGS+=	-I${DESTDIR}/usr/include/krb5
 .endif
 CPPFLAGS+=	-DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 .ifndef HOSTPROG
 VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}

--- a/usr.bin/kdestroy/Makefile
+++ b/usr.bin/kdestroy/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/07/23 08:01:32 itojun Exp $
+# $NetBSD: Makefile,v 1.15 2005/01/10 03:11:18 lukem Exp $

 NOLINT= # defined

@ -26,6 +26,10 @@ CPPFLAGS+= -I.					\
 	-I${DESTDIR}/usr/include/krb5		\
 	-DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}

 LDADD+= -lkafs -lkrb5 ${KRB4LDADD} -lcrypto -lasn1 -lcom_err \
--- a/usr.bin/kgetcred/Makefile
+++ b/usr.bin/kgetcred/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2004/05/25 10:31:46 lha Exp $
+# $NetBSD: Makefile,v 1.2 2005/01/10 03:11:18 lukem Exp $

 NOLINT= # defined

@ -19,6 +19,10 @@ CPPFLAGS+= -I.					\
 	 -I${DESTDIR}/usr/include/krb5		\
 	 -DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}

 LDADD+=	-lkrb5 -lcrypto -lasn1 -lcom_err \
--- a/usr.bin/kinit/Makefile
+++ b/usr.bin/kinit/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/12/13 22:07:35 chs Exp $
+# $NetBSD: Makefile,v 1.18 2005/01/10 03:11:18 lukem Exp $

 NOLINT= # defined

@ -20,6 +20,10 @@ KRB4LDADD= -lkrb -ldes
 KRB4DPADD= ${LIBKRB} ${LIBDES}
 .endif

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 CPPFLAGS+= -I.					\
 	 -I${DIST}/heimdal/kuser		\
 	 -I${NETBSDSRCDIR}/include/heimdal	\
--- a/usr.bin/klist/Makefile
+++ b/usr.bin/klist/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/07/23 08:01:34 itojun Exp $
+# $NetBSD: Makefile,v 1.14 2005/01/10 03:11:18 lukem Exp $

 NOLINT= # defined

@ -27,6 +27,10 @@ CPPFLAGS+= -I.					\
 	-I${DESTDIR}/usr/include/krb5		\
 	-DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}

 LDADD+=	-lkafs -lkrb5 ${KRB4LDADD} -lcrypto -lasn1 -lcom_err \
--- a/usr.bin/mk_cmds/Makefile
+++ b/usr.bin/mk_cmds/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/10/23 01:25:38 itojun Exp $
+# $NetBSD: Makefile,v 1.12 2005/01/10 03:11:18 lukem Exp $

 NOMAN=	# defined
 NOLINT= # defined
@ -22,6 +22,10 @@ CFLAGS+= -I.					\
 	-I${DESTDIR}/usr/include/krb5		\
 	-DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}

 LDADD+=	-L${VERS} -lvers -lroken -lcrypt
--- a/usr.bin/string2key/Makefile
+++ b/usr.bin/string2key/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/10/23 01:25:38 itojun Exp $
+# $NetBSD: Makefile,v 1.14 2005/01/10 03:11:18 lukem Exp $

 NOLINT= # defined

@ -23,6 +23,10 @@ CPPFLAGS+= -I.					\
 	-I${DESTDIR}/usr/include/krb5		\
 	-DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}

 LDADD+=	-lkrb5 -lcrypto -lasn1 -lcom_err -L${VERS} -lvers \
--- a/usr.sbin/hprop/Makefile
+++ b/usr.sbin/hprop/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/23 08:01:40 itojun Exp $
+# $NetBSD: Makefile,v 1.10 2005/01/10 03:11:18 lukem Exp $

 NOLINT= # defined

@ -32,6 +32,10 @@ CPPFLAGS+= -I.					\
 	-I${DESTDIR}/usr/include/krb5		\
 	-DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}

 LDADD+=	-lhdb -lkrb5 ${KRB4LDADD} -lcrypto -lasn1 \
--- a/usr.sbin/kadmin/Makefile
+++ b/usr.sbin/kadmin/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/10/23 01:09:50 itojun Exp $
+# $NetBSD: Makefile,v 1.15 2005/01/10 03:11:18 lukem Exp $

 NOLINT= # defined

@ -36,6 +36,10 @@ CPPFLAGS+= -I.					\
 	-I${DESTDIR}/usr/include/krb5		\
 	-DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}

 LDADD+=	-lkadm5srv -lhdb -lkrb5 -lcrypto -lasn1  \
--- a/usr.sbin/kdc/Makefile
+++ b/usr.sbin/kdc/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/08/23 23:03:45 lha Exp $
+# $NetBSD: Makefile,v 1.11 2005/01/10 03:11:18 lukem Exp $

 NOLINT= # defined

@ -39,6 +39,10 @@ CPPFLAGS+= -I.					\
 	-I${DESTDIR}/usr/include/krb5		\
 	-DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}

 LDADD+=	-lhdb -lkrb5 ${KRB4LDADD} -lcrypto -lasn1 -lcom_err \
--- a/usr.sbin/kstash/Makefile
+++ b/usr.sbin/kstash/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/10/23 01:11:09 itojun Exp $
+# $NetBSD: Makefile,v 1.13 2005/01/10 03:11:18 lukem Exp $

 NOLINT= # defined

@ -22,6 +22,10 @@ CPPFLAGS+= -I.					\
 	-I${DESTDIR}/usr/include/krb5		\
 	-DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}

 LDADD+=	-lhdb -lkrb5 -lcrypto -lasn1 -lcom_err \
--- a/usr.sbin/ktutil/Makefile
+++ b/usr.sbin/ktutil/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/10/23 01:12:28 itojun Exp $
+# $NetBSD: Makefile,v 1.16 2005/01/10 03:11:18 lukem Exp $

 NOLINT= # defined

@ -28,6 +28,10 @@ CPPFLAGS+= -I.					\
 	-I${DESTDIR}/usr/include/krb5		\
 	-DHAVE_CONFIG_H

+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DHAVE_IPV6
+.endif
+
 VERS!=	cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}

 LDADD+=	-lkadm5clnt -lkrb5 -lcrypto -lasn1 -lcom_err \