From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Mon, 23 Jan 2012 08:30:48 +0000 (-0800)
Subject: Unbreak buildworld due to the libpcap import.
X-Git-Tag: v3.4.0rc~1359
X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/4d37d7b9ae205b8c0c40ad5707b909cf68ed2785

Unbreak buildworld due to the libpcap import.
---

diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index 8f14d6f908..e515fa481d 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -6,7 +6,8 @@ SRCS=	pcap-bpf.c \
 	pcap.c inet.c gencode.c optimize.c nametoaddr.c etherent.c \
 	savefile.c sf-pcap.c sf-pcap-ng.c pcap-common.c \
 	bpf_image.c bpf_dump.c \
-	scanner.l grammar.y bpf_filter.c version.c
+	scanner.l grammar.y bpf_filter.c version.c \
+	version.h tokdefs.h
 
 INCS=	pcap.h \
 	pcap-bpf.h \
@@ -100,7 +101,7 @@ WARNS?=	2
 
 LFLAGS+=-Ppcap_
 YFLAGS+=-p pcap_
-CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR}
+CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR} -I${.OBJDIR}
 CFLAGS+=-D_U_="__attribute__((unused))" -DYYBISON
 CFLAGS+=-DHAVE_STRUCT_ETHER_ADDR -DHAVE_NET_PFVAR_H
 .if !defined(NOINET6)
@@ -127,9 +128,6 @@ version.h: VERSION
 tokdefs.h: grammar.h
 	${LN} -sf grammar.h tokdefs.h
 
-pcap.o:	version.h
-scanner.o: scanner.c tokdefs.h
-
 #
 # Magic to convert the man pages to something non Solarish
 #
diff --git a/usr.sbin/802_11/wpa_supplicant/Packet32.c b/usr.sbin/802_11/wpa_supplicant/Packet32.c
index ac7c9f442d..9e4f459f9d 100644
--- a/usr.sbin/802_11/wpa_supplicant/Packet32.c
+++ b/usr.sbin/802_11/wpa_supplicant/Packet32.c
@@ -55,6 +55,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#include <net/bpf.h>
 #include <net/route.h>
 
 #include <netproto/802_11/ieee80211_ioctl.h>
diff --git a/usr.sbin/pflogd/Makefile b/usr.sbin/pflogd/Makefile
index 54ad7a5c13..c789b0d904 100644
--- a/usr.sbin/pflogd/Makefile
+++ b/usr.sbin/pflogd/Makefile
@@ -2,7 +2,8 @@
 
 LDADD+= -lpcap -lutil
 DPADD+=	${LIBPCAP} ${LIBUTIL}
-CFLAGS+= -DHAVE_SNPRINTF
+CFLAGS+= -DHAVE_SNPRINTF -I${.CURDIR}/../../contrib/libpcap
+WARNS?=	4
 
 PROG=	pflogd
 SRCS=	pflogd.c privsep.c privsep_fdpass.c
diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile
index b383785f42..15b813e5c4 100644
--- a/usr.sbin/pppd/Makefile
+++ b/usr.sbin/pppd/Makefile
@@ -24,7 +24,7 @@ CFLAGS+=-DCBCP_SUPPORT
 SRCS+=	cbcp.c
 
 # Filter support
-CFLAGS+=-DPPP_FILTER
+CFLAGS+=-DPPP_FILTER -I${.CURDIR}/../../contrib/libpcap
 LDADD+=	-lpcap
 DPADD+=	${LIBPCAP}