don't require netinet6/ipcomp.h. define it on our own.

diff --git a/configure.in b/configure.in
index aa1c5090db9716151a4692659da237cbd1451d8a..9490e1c02f8033f7a6da4dc4d8043042c518947a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.103 2000-01-19 04:42:20 itojun Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.104 2000-01-19 04:51:10 itojun 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.103 $)
+AC_REVISION($Revision: 1.104 $)
 AC_PREREQ(2.13)
 AC_INIT(tcpdump.c)
 
@@ -434,7 +434,7 @@ AC_C_BIGENDIAN
 AC_CHECK_LIB(dnet, main)
 AC_CHECK_LIB(rpc, main)
 AC_CHECK_LIB(z, uncompress)
-AC_CHECK_HEADERS(zlib.h netinet6/ipcomp.h)
+AC_CHECK_HEADERS(zlib.h)
 
 AC_LBL_TYPE_SIGNAL
 

diff --git a/print-ipcomp.c b/print-ipcomp.c
index 2cecb3265a39c00af6cb8eedee5eed60a4fdbef1..86625429b26976663a4a2f5af43fd060102e78db 100644 (file)
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.3 2000-01-09 21:34:18 fenner Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.4 2000-01-19 04:51:11 itojun Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -52,15 +52,12 @@ static const char rcsid[] =
 #ifdef INET6
 #include <netinet/ip6.h>
 #endif
-#ifdef HAVE_NETINET6_IPCOMP_H
-#include <netinet6/ipcomp.h>
-#else
+
 struct ipcomp {
        u_int8_t comp_nxt;      /* Next Header */
        u_int8_t comp_flags;    /* Length of data, in 32bit */
        u_int16_t comp_cpi;     /* Compression parameter index */
 };
-#endif
 
 #if defined(HAVE_LIBZ) && defined(HAVE_ZLIB_H)
 #include <zlib.h>