From 4f9bc6c6b7d90dd654e63603252db0ff04a0c666 Mon Sep 17 00:00:00 2001
From: Steve Price <steve@FreeBSD.org>
Date: Sat, 15 Apr 2000 20:45:52 +0000
Subject: [PATCH] Don't try to compile in INET6 support when NOINET6 is
 defined.

---
 lib/libipsec/Makefile | 5 ++++-
 lib/libpcap/Makefile  | 5 ++++-
 lib/libwrap/Makefile  | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile
index 83c17ac15303..bac3dd2ec52c 100644
--- a/lib/libipsec/Makefile
+++ b/lib/libipsec/Makefile
@@ -30,7 +30,10 @@ LIB=	ipsec
 SHLIB_MAJOR= 0
 SHLIB_MINOR= 0
 CFLAGS+=-I${.OBJDIR}
-CFLAGS+=-DIPSEC_DEBUG -DIPSEC -DINET6
+CFLAGS+=-DIPSEC_DEBUG -DIPSEC
+.if !defined(NOINET6)
+CFLAGS+=-DINET6
+.endif
 
 .PATH:	${.CURDIR}/../../sys/netkey
 SRCS=	pfkey.c pfkey_dump.c
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index ae4c9caca2cd..ab0eeac171d3 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -11,7 +11,10 @@ CLEANFILES=tokdefs.h version.c
 
 DEFS=	-DHAVE_SYS_IOCCOM_H=1 -DHAVE_SYS_SOCKIO_H=1 \
 	-DHAVE_ETHER_HOSTTON=1 -DHAVE_STRERROR=1 \
-	-DHAVE_SOCKADDR_SA_LEN=1 -DLBL_ALIGN=1 -DINET6
+	-DHAVE_SOCKADDR_SA_LEN=1 -DLBL_ALIGN=1
+.if !defined(NOINET6)
+DEFS+=	-DINET6
+.endif
 
 CFLAGS+=-I. -Dyylval=pcap_lval ${DEFS}
 
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index 845096131a8a..4422cfaff6a3 100644
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@@ -17,7 +17,10 @@ CFLAGS+=-DFACILITY=LOG_AUTH -DHOSTS_ACCESS -DNETGROUP -DDAEMON_UMASK=022 \
 	-DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \
 	-DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \
 	-DSYS_ERRLIST_DEFINED -DALWAYS_HOSTNAME
-CFLAGS+=-DINET6 -DUSE_GETIPNODEBY
+CFLAGS+=-DUSE_GETIPNODEBY
+.if !defined(NOINET6)
+CFLAGS+=-DINET6
+.endif
 
 SRCS=	clean_exit.c diag.c eval.c fix_options.c fromhost.c \
 	hosts_access.c hosts_ctl.c misc.c myvsyslog.c options.c \