Fix checks for header files in configure.ac

diff --git a/configure.ac b/configure.ac
index bd3f9563fc10df75c40caa85d1ce44e6e81e302d..bb25f7776b66703015e7aa34bc3875323ce5adfc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,8 +24,9 @@ AM_CONDITIONAL([USE_SNMP], [test "${with_snmp}" != "no"])
 
 # Checks for header files.
 AC_CHECK_DECLS([TAILQ_FIRST, TAILQ_NEXT, TAILQ_FOREACH, TAILQ_EMPTY],[],[],[[#include <sys/queue.h>]])
-AC_CHECK_DECL([PACKET_ORIGDEV],[],[],[[#include <linux/if_packet.h>]])
-AC_CHECK_DECL([ADVERTISED_2500baseX_Full],[],[],[[#include <linux/ethtool.h>]])
+AC_CHECK_DECLS([PACKET_ORIGDEV],[],[],[[#include <linux/if_packet.h>]])
+AC_CHECK_DECLS([ADVERTISED_2500baseX_Full],[],[],[[#include <linux/ethtool.h>]])
+AC_CHECK_DECLS([ETHERTYPE_VLAN],[],[],[[#include <net/ethernet.h>]])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST

diff --git a/src/compat.h b/src/compat.h
index 8e1528f9f31f86fb71c9c1bd080565e666b1723f..77276a51f610db79a09e7ee024d854f3a70ea9f1 100644 (file)
--- a/src/compat.h
+++ b/src/compat.h
@@ -55,3 +55,7 @@
 #if !HAVE_DECL_PACKET_ORIGDEV
 #define PACKET_ORIGDEV 9
 #endif
+
+#if !HAVE_DECL_ETHERTYPE_VLAN
+#define ETHERTYPE_VLAN 0x8100
+#endif

diff --git a/src/lldpd.c b/src/lldpd.c
index 48fb4836077b3a56510060a2d08c355a34566e16..5a649aee3e3baacb40afa3459d5d30db49cd7a42 100644 (file)
--- a/src/lldpd.c
+++ b/src/lldpd.c
@@ -32,11 +32,11 @@
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #include <arpa/inet.h>
-#include <netpacket/packet.h>
 #include <ifaddrs.h>
 #include <net/if_arp.h>
 #include <linux/filter.h>
 #include <linux/if_vlan.h>
+#include <linux/if_packet.h>
 #include <linux/sockios.h>
 #include <linux/ethtool.h>