Use pcap/bpf.h if available

Makefile.in

@@ -9,7 +9,7 @@
 CC= gcc
 AR=/usr/bin/ar
 RANLIB=/usr/bin/ranlib
-CCOPT= -O2 -Wall @PCAP_INCLUDE@ @TCL_INC@ @USE_TCL@
+CCOPT= -O2 -Wall @PCAP_INCLUDE@ @TCL_INC@ @USE_TCL@ @USE_PCAP_BPF@
 DEBUG= -g
 #uncomment the following if you need libpcap based build under linux
 #(not raccomanded)

configure

@@ -102,6 +102,14 @@ then
 	TCL_LIB="-ltcl${LIBPOSTFIX} -lm -lpthread"
 fi
 
+#
+# PCAP_BPF detection
+#
+if [ -f "/usr/include/pcap/bpf.h" ]
+then
+   USE_PCAP_BPF="-DUSE_PCAP_BPF"
+fi
+
 #
 # configurable stuff
 #
@@ -140,6 +148,7 @@ sed	-e "s^@PCAP@^$PCAP^g" \
 	-e "s^@MANPATH@^$INSTALL_MANPATH^g" \
 	-e "s^@SOLARISLIB@^$SOLARISLIB^g" \
 	-e "s^@USE_TCL@^$USE_TCL^g" \
+	-e "s^@USE_PCAP_BPF@^$USE_PCAP_BPF^g" \
 	-e "s^@TCL_INC@^$TCL_INC^g" \
 	-e "s^@TCL_VER@^$TCL_VER^g" \
 	-e "s^@TCL_LIB@^$TCL_LIB^g" \

libpcap_stuff.c

@@ -16,7 +16,11 @@
 #include <string.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
+#ifdef USE_PCAP_BPF
+#include <pcap/bpf.h>
+#else
 #include <net/bpf.h>
+#endif
 #include <pcap.h>
 
 #include "globals.h"

script.c

@@ -23,7 +23,13 @@
 #include <sched.h>
 
 #include <sys/ioctl.h>
+
+#ifdef USE_PCAP_BPF
+#include <pcap/bpf.h>
+#else
 #include <net/bpf.h>
+#endif
+
 #include <pcap.h>
 
 #include "release.h"