From 02cb746956a63297f09cf799fffa2fc95119236b Mon Sep 17 00:00:00 2001
From: glebius <glebius@FreeBSD.org>
Date: Wed, 12 Feb 2014 09:59:48 +0000
Subject: Fix world build WITHOUT_PF.

Sponsored by:	Nginx, Inc.
---
 usr.bin/kdump/Makefile | 4 ++++
 usr.bin/kdump/mkioctls | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'usr.bin/kdump')

diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
index d65779e..f9d56cc 100644
--- a/usr.bin/kdump/Makefile
+++ b/usr.bin/kdump/Makefile
@@ -20,6 +20,10 @@ LDADD+=	-lcapsicum -lnv
 CFLAGS+=-DHAVE_LIBCAPSICUM
 .endif
 
+.if ${MK_PF} != "no"
+CFLAGS+=-DPF
+.endif
+
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 SRCS+=		linux_syscalls.c
 .endif
diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls
index 0dac684..a9ba860 100644
--- a/usr.bin/kdump/mkioctls
+++ b/usr.bin/kdump/mkioctls
@@ -21,7 +21,8 @@ LC_ALL=C; export LC_ALL
 # XXX should we use an ANSI cpp?
 ioctl_includes=$(
 	cd $includedir
-	find -H -s * -name '*.h' | grep -v '.*disk.*\.h' | \
+	find -H -s * -name '*.h' | \
+	egrep -v '(.*disk.*|net/pfvar|net/if_pfsync)\.h' | \
 		xargs egrep -l \
 '^#[ 	]*define[ 	]+[A-Za-z_][A-Za-z0-9_]*[ 	]+_IO[^a-z0-9_]' |
 		awk '{printf("#include <%s>\\n", $1)}'
@@ -54,7 +55,10 @@ BEGIN {
 	print "#include <net/ethernet.h>"
 	print "#include <net/if.h>"
 	print "#include <net/if_var.h>"
+	print "#ifdef PF"
 	print "#include <net/pfvar.h>"
+	print "#include <net/if_pfsync.h>"
+	print "#endif"
 	print "#include <net/route.h>"
 	print "#include <netinet/in.h>"
 	print "#include <netinet/ip_mroute.h>"
-- 
cgit v1.1