From ab1c0634f4c2f22fe685fb1ceac80c993b9f70dd Mon Sep 17 00:00:00 2001
From: guy <guy>
Date: Fri, 14 Jul 2000 02:12:36 +0000
Subject: [PATCH] libpcap doesn't use <sys/ioccom.h>, but the test program in
 "AC_LBL_FIXINCLUDES" does, so we have to check for it, otherwise the
 configure script fails on, among other platforms, Solaris.

---
 configure    |  2 +-
 configure.in | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 05eead0..7df810c 100755
--- a/configure
+++ b/configure
@@ -1316,7 +1316,7 @@ else
 fi
 echo "$ac_t""$CPP" 1>&6
 
-for ac_hdr in sys/sockio.h ifaddrs.h
+for ac_hdr in sys/ioccom.h sys/sockio.h ifaddrs.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 d748e5a..ac155e6 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.83 2000-07-11 00:38:19 assar Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.84 2000-07-14 02:12: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.83 $)
+AC_REVISION($Revision: 1.84 $)
 AC_INIT(pcap.c)
 
 AC_CANONICAL_SYSTEM
@@ -17,7 +17,13 @@ AC_C___ATTRIBUTE__
 
 AC_LBL_CHECK_TYPE(u_int32_t, u_int)
 
-AC_CHECK_HEADERS(sys/sockio.h ifaddrs.h)
+dnl
+dnl libpcap doesn't itself use <sys/ioccom.h>; however, the test program
+dnl in "AC_LBL_FIXINCLUDES" in "aclocal.m4" uses it, so we have to
+dnl test for it and set "HAVE_SYS_IOCCOM_H" if we have it, otherwise
+dnl "AC_LBL_FIXINCLUDES" won't work on some platforms such as Solaris.
+dnl
+AC_CHECK_HEADERS(sys/ioccom.h sys/sockio.h ifaddrs.h)
 
 AC_LBL_FIXINCLUDES