From 8846bbf3cec07539f1694cbf7ad0f4b722761312 Mon Sep 17 00:00:00 2001
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Tue, 29 Nov 2005 17:56:11 +0000
Subject: [PATCH] obey opt_inet6.h and opt_ipsec.h in kernel build directory.

Requested by:	hrs
---
 sys/modules/ipfw/Makefile | 14 ++++++++++++++
 sys/netinet/ip_fw2.c      |  4 ++--
 sys/netinet/ip_fw_pfil.c  |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile
index cd5a6f791e4..c8c82cc67f2 100644
--- a/sys/modules/ipfw/Makefile
+++ b/sys/modules/ipfw/Makefile
@@ -4,6 +4,7 @@
 
 KMOD=	ipfw
 SRCS=	ip_fw2.c ip_fw_pfil.c
+SRCS+=	opt_inet6.h opt_ipsec.h
 
 CFLAGS+= -DIPFIREWALL
 #
@@ -15,4 +16,17 @@ CFLAGS+= -DIPFIREWALL
 #CFLAGS+= -DIPFIREWALL_DEFAULT_TO_ACCEPT
 #
 
+.if !defined(KERNBUILDDIR)
+.if defined(NO_INET6)
+opt_inet6.h:
+	cat /dev/null > ${.TARGET}
+.else
+opt_inet6.h:
+	echo "#define INET6 1" > ${.TARGET}
+.endif
+
+opt_ipsec.h:
+	cat /dev/null > ${.TARGET}
+.endif
+
 .include <bsd.kmod.mk>
diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c
index f2c6504da5d..f42ca3892fe 100644
--- a/sys/netinet/ip_fw2.c
+++ b/sys/netinet/ip_fw2.c
@@ -37,12 +37,12 @@
 #include "opt_ip6fw.h"
 #include "opt_ipdn.h"
 #include "opt_inet.h"
-#include "opt_inet6.h"
-#include "opt_ipsec.h"
 #ifndef INET
 #error IPFIREWALL requires INET.
 #endif /* INET */
 #endif
+#include "opt_inet6.h"
+#include "opt_ipsec.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netinet/ip_fw_pfil.c b/sys/netinet/ip_fw_pfil.c
index ab1ff5596d1..65fbf820267 100644
--- a/sys/netinet/ip_fw_pfil.c
+++ b/sys/netinet/ip_fw_pfil.c
@@ -30,11 +30,11 @@
 #include "opt_ipfw.h"
 #include "opt_ipdn.h"
 #include "opt_inet.h"
-#include "opt_inet6.h"
 #ifndef INET
 #error IPFIREWALL requires INET.
 #endif /* INET */
 #endif /* KLD_MODULE */
+#include "opt_inet6.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>