Sigh. Not all systems have <netinet/if_ether.h> - for example, at least

some libc5 Linux systems don't - so we have to check whether it exists,
and include it only if it does.

diff --git a/addrtoname.c b/addrtoname.c
index 6d6df41a8f55cb50417e686c4f2bca3d118d2a97..f399b044474f17fb7cc8b46d6faf5c48c1fbd1e1 100644 (file)
--- a/addrtoname.c
+++ b/addrtoname.c
@@ -23,7 +23,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.69 2000-10-07 05:33:25 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.70 2001-01-17 18:27:36 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -39,7 +39,9 @@ struct rtentry;
 #include <net/if.h>
 
 #include <netinet/in.h>
+#ifdef HAVE_NETINET_IF_ETHER_H
 #include <netinet/if_ether.h>
+#endif
 
 #include <arpa/inet.h>
 

diff --git a/config.h.in b/config.h.in
index 79fb02b3d42f7e2edf096ac82a68d7cf8dbaaf93..36926814960bfaee94762c5d581d1af67b464a52 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -164,6 +164,9 @@
 /* Define if you have the <fcntl.h> header file.  */
 #undef HAVE_FCNTL_H
 
+/* Define if you have the <netinet/if_ether.h> header file.  */
+#undef HAVE_NETINET_IF_ETHER_H
+
 /* Define if you have the <rc5.h> header file.  */
 #undef HAVE_RC5_H
 

diff --git a/configure b/configure
index d40a474330e2b54f6bffc56e1da5b03ae3180252..408631691442b53b945636e5c95bae05f4b2d9a3 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.132 
+# From configure.in Revision: 1.133 
 
 
 
@@ -1299,7 +1299,7 @@ else
 fi
 echo "$ac_t""$CPP" 1>&6
 
-for ac_hdr in fcntl.h rpc/rpcent.h
+for ac_hdr in fcntl.h rpc/rpcent.h netinet/if_ether.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

diff --git a/configure.in b/configure.in
index fe13744ed9fb94c04fa3b0069519da0d79cbd0ab..29f77785450b143f7c580a4bce3a66b39274c175 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.132 2001-01-09 07:21:53 fenner Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.133 2001-01-17 18:27:36 guy Exp $ (LBL)
 dnl
 dnl Copyright (c) 1994, 1995, 1996, 1997
 dnl    The Regents of the University of California.  All rights reserved.
@@ -6,7 +6,7 @@ dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
 
-AC_REVISION($Revision: 1.132 $)
+AC_REVISION($Revision: 1.133 $)
 AC_PREREQ(2.13)
 AC_INIT(tcpdump.c)
 
@@ -16,7 +16,7 @@ AC_LBL_C_INIT(V_CCOPT, V_INCLS)
 AC_C_INLINE
 AC_C___ATTRIBUTE__
 
-AC_CHECK_HEADERS(fcntl.h rpc/rpcent.h)
+AC_CHECK_HEADERS(fcntl.h rpc/rpcent.h netinet/if_ether.h)
 AC_HEADER_TIME
 
 case "$target_os" in