Index: savefile.c
===================================================================
--- savefile.c	(revision 3422)
+++ savefile.c	(working copy)
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.126.2.27 2007/07/19 06:20:53 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.126.2.30 2007/08/14 20:57:49 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -530,7 +530,28 @@
  */
 #define LINKTYPE_SITA		196
 
+/*
+ * Various link-layer types, with a pseudo-header, for Endace DAG cards;
+ * encapsulates Endace ERF records.  Requested by Stephen Donnelly
+ * <stephen@endace.com>.
+ */
+#define LINKTYPE_ERF		197
 
+/*
+ * Special header prepended to Ethernet packets when capturing from a
+ * u10 Networks board.  Requested by Phil Mulholland
+ * <phil@u10networks.com>.
+ */
+#define LINKTYPE_RAIF1		198
+
+/*
+ * IPMB packet for IPMI, beginning with the I2C slave address, followed
+ * by the netFn and LUN, etc..  Requested by Chanthy Toeung
+ * <chanthy.toeung@ca.kontron.com>.
+ */
+#define LINKTYPE_IPMB		199
+
+
 static struct linktype_map {
 	int	dlt;
 	int	linktype;
@@ -781,6 +802,15 @@
 	/* Various link-layer types for SITA */
 	{ DLT_SITA,		LINKTYPE_SITA },
 
+	/* Various link-layer types for Endace */
+	{ DLT_ERF,		LINKTYPE_ERF },
+
+	/* Special header for u10 Networks boards */
+	{ DLT_RAIF1,		LINKTYPE_RAIF1 },
+
+	/* IPMB */
+	{ DLT_IPMB,		LINKTYPE_IPMB },
+
 	{ -1,			-1 }
 };
 
Index: optimize.c
===================================================================
--- optimize.c	(revision 3422)
+++ optimize.c	(working copy)
@@ -22,7 +22,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/optimize.c,v 1.85.2.2 2007/07/15 19:55:04 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/optimize.c,v 1.85.2.3 2007/09/12 21:29:45 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -1972,7 +1972,7 @@
 	 */
 	unMarkAll();
 	n = count_blocks(root);
-	blocks = (struct block **)malloc(n * sizeof(*blocks));
+	blocks = (struct block **)calloc(n, sizeof(*blocks));
 	if (blocks == NULL)
 		bpf_error("malloc");
 	unMarkAll();
@@ -1980,14 +1980,14 @@
 	number_blks_r(root);
 
 	n_edges = 2 * n_blocks;
-	edges = (struct edge **)malloc(n_edges * sizeof(*edges));
+	edges = (struct edge **)calloc(n_edges, sizeof(*edges));
 	if (edges == NULL)
 		bpf_error("malloc");
 
 	/*
 	 * The number of levels is bounded by the number of nodes.
 	 */
-	levels = (struct block **)malloc(n_blocks * sizeof(*levels));
+	levels = (struct block **)calloc(n_blocks, sizeof(*levels));
 	if (levels == NULL)
 		bpf_error("malloc");
 
@@ -2034,8 +2034,8 @@
 	 * we'll need.
 	 */
 	maxval = 3 * max_stmts;
-	vmap = (struct vmapinfo *)malloc(maxval * sizeof(*vmap));
-	vnode_base = (struct valnode *)malloc(maxval * sizeof(*vnode_base));
+	vmap = (struct vmapinfo *)calloc(maxval, sizeof(*vmap));
+	vnode_base = (struct valnode *)calloc(maxval, sizeof(*vnode_base));
 	if (vmap == NULL || vnode_base == NULL)
 		bpf_error("malloc");
 }
Index: VERSION
===================================================================
--- VERSION	(revision 3422)
+++ VERSION	(working copy)
@@ -1 +1 @@
-0.9.7
+0.9.8
Index: INSTALL.txt
===================================================================
--- INSTALL.txt	(revision 3422)
+++ INSTALL.txt	(working copy)
@@ -1,4 +1,4 @@
-@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.12.2.1 2005/06/20 21:30:14 guy Exp $ (LBL)
+@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.12.2.2 2007/09/12 19:17:24 guy Exp $ (LBL)
 
 To build libpcap, run "./configure" (a shell script). The configure
 script will determine your system attributes and generate an
@@ -373,7 +373,6 @@
 pcap.3		- manual entry
 pcap.c		- pcap utility routines
 pcap.h		- public libpcap definitions
-pf.h		- OpenBSD DLT_PFLOG definitions
 ppp.h		- Point to Point Protocol definitions
 rawss7.h	- information on DLT_ types for SS7
 savefile.c	- offline support
Index: gencode.c
===================================================================
--- gencode.c	(revision 3422)
+++ gencode.c	(working copy)
@@ -21,7 +21,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.221.2.52 2007/06/22 06:43:58 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.221.2.53 2007/09/12 19:17:24 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -73,7 +73,12 @@
 #include "ppp.h"
 #include "sll.h"
 #include "arcnet.h"
-#include "pf.h"
+#ifdef HAVE_NET_PFVAR_H
+#include <sys/socket.h>
+#include <net/if.h>
+#include <net/pfvar.h>
+#include <net/if_pflog.h>
+#endif
 #ifndef offsetof
 #define offsetof(s, e) ((size_t)&((s *)0)->e)
 #endif
@@ -1175,12 +1180,13 @@
 		off_nl_nosnap = 44;	/* XXX - what does it do with 802.3 packets? */
 		return;
 
+#ifdef HAVE_NET_PFVAR_H
 	case DLT_PFLOG:
 		off_linktype = 0;
-		/* XXX read this from pf.h? */
 		off_nl = PFLOG_HDRLEN;
 		off_nl_nosnap = PFLOG_HDRLEN;	/* no 802.2 LLC */
 		return;
+#endif
 
         case DLT_JUNIPER_MFR:
         case DLT_JUNIPER_MLFR:
@@ -2426,6 +2432,7 @@
 		}
 		return (gen_cmp(OR_LINK, 0, BPF_W, (bpf_int32)proto));
 
+#ifdef HAVE_NET_PFVAR_H
 	case DLT_PFLOG:
 		/*
 		 * af field is host byte order in contrast to the rest of
@@ -2443,6 +2450,7 @@
 			return gen_false();
 		/*NOTREACHED*/
 		break;
+#endif /* HAVE_NET_PFVAR_H */
 
 	case DLT_ARCNET:
 	case DLT_ARCNET_LINUX:
@@ -6374,10 +6382,12 @@
 		}
 		break;
 
+#ifdef HAVE_NET_PFVAR_H
 	case DLT_PFLOG:
 		b0 = gen_cmp(OR_LINK, offsetof(struct pfloghdr, dir), BPF_B,
 		    (bpf_int32)((dir == 0) ? PF_IN : PF_OUT));
 		break;
+#endif
 
 	case DLT_PPP_PPPD:
 		if (dir) {
@@ -6425,6 +6435,7 @@
 	return (b0);
 }
 
+#ifdef HAVE_NET_PFVAR_H
 /* PF firewall log matched interface */
 struct block *
 gen_pf_ifname(const char *ifname)
@@ -6534,8 +6545,57 @@
 
 	return (b0);
 }
+#else /* !HAVE_NET_PFVAR_H */
+struct block *
+gen_pf_ifname(const char *ifname)
+{
+	bpf_error("libpcap was compiled without pf support");
+	/* NOTREACHED */
+	return (NULL);
+}
 
 struct block *
+gen_pf_ruleset(char *ruleset)
+{
+	bpf_error("libpcap was compiled on a machine without pf support");
+	/* NOTREACHED */
+	return (NULL);
+}
+
+struct block *
+gen_pf_rnr(int rnr)
+{
+	bpf_error("libpcap was compiled on a machine without pf support");
+	/* NOTREACHED */
+	return (NULL);
+}
+
+struct block *
+gen_pf_srnr(int srnr)
+{
+	bpf_error("libpcap was compiled on a machine without pf support");
+	/* NOTREACHED */
+	return (NULL);
+}
+
+struct block *
+gen_pf_reason(int reason)
+{
+	bpf_error("libpcap was compiled on a machine without pf support");
+	/* NOTREACHED */
+	return (NULL);
+}
+
+struct block *
+gen_pf_action(int action)
+{
+	bpf_error("libpcap was compiled on a machine without pf support");
+	/* NOTREACHED */
+	return (NULL);
+}
+#endif /* HAVE_NET_PFVAR_H */
+
+struct block *
 gen_acode(eaddr, q)
 	register const u_char *eaddr;
 	struct qual q;
Index: configure.in
===================================================================
--- configure.in	(revision 3422)
+++ configure.in	(working copy)
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.120.2.12 2007/06/15 17:57:26 guy Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.120.2.13 2007/09/12 19:17:24 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 Process this file with autoconf to produce a configure script.
 dnl
 
-AC_REVISION($Revision: 1.120.2.12 $)
+AC_REVISION($Revision: 1.120.2.13 $)
 AC_PREREQ(2.50)
 AC_INIT(pcap.c)
 
@@ -27,6 +27,9 @@
 dnl "AC_LBL_FIXINCLUDES" won't work on some platforms such as Solaris.
 dnl
 AC_CHECK_HEADERS(sys/ioccom.h sys/sockio.h limits.h paths.h)
+AC_CHECK_HEADERS(net/pfvar.h, , , [#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>])
 AC_CHECK_HEADERS(netinet/if_ether.h, , , [#include <sys/types.h>
 #include <sys/socket.h>])
 if test "$ac_cv_header_netinet_if_ether_h" != yes; then
Index: config.h.in
===================================================================
--- config.h.in	(revision 3422)
+++ config.h.in	(working copy)
@@ -56,6 +56,9 @@
 /* Define to 1 if you have the <netinet/if_ether.h> header file. */
 #undef HAVE_NETINET_IF_ETHER_H
 
+/* Define to 1 if you have the <net/pfvar.h> header file. */
+#undef HAVE_NET_PFVAR_H
+
 /* if there's an os_proto.h */
 #undef HAVE_OS_PROTO_H
 
Index: configure
===================================================================
--- configure	(revision 3422)
+++ configure	(working copy)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.120.2.12 .
+# From configure.in Revision: 1.120.2.13 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -4231,6 +4231,66 @@
 done
 
 
+for ac_header in net/pfvar.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
 for ac_header in netinet/if_ether.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
Index: CREDITS
===================================================================
--- CREDITS	(revision 3422)
+++ CREDITS	(working copy)
@@ -66,6 +66,7 @@
 	Mark Pizzolato			<List-tcpdump-workers@subscriptions.pizzolato.net>
 	Martin Husemann			<martin@netbsd.org>
 	Matthew Luckie			<mjl@luckie.org.nz>
+	Max Laier			<max@love2party.net>
 	Mike Kershaw			<dragorn@kismetwireless.net>
 	Mike Wiacek			<mike@iroot.net>
 	Monroe Williams			<monroe@pobox.com>
@@ -82,6 +83,7 @@
 	Peter Jeremy			<peter.jeremy@alcatel.com.au>
 	Phil Wood			<cpw@lanl.gov>
 	Rafal Maszkowski		<rzm@icm.edu.pl>
+					<rcb-isis@users.sourceforge.net>
 	Rick Jones			<raj@cup.hp.com>
 	Scott Barron			<sb125499@ohiou.edu>
 	Scott Gifford			<sgifford@tir.com>
Index: grammar.y
===================================================================
--- grammar.y	(revision 3422)
+++ grammar.y	(working copy)
@@ -22,7 +22,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.86.2.8 2007/06/11 09:52:04 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.86.2.9 2007/09/12 19:17:25 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -52,7 +52,11 @@
 #include "pcap-int.h"
 
 #include "gencode.h"
-#include "pf.h"
+#ifdef HAVE_NET_PFVAR_H
+#include <net/if.h>
+#include <net/pfvar.h>
+#include <net/if_pflog.h>
+#endif
 #include <pcap-namedb.h>
 
 #ifdef HAVE_OS_PROTO_H
@@ -85,6 +89,50 @@
 }
 #endif
 
+#ifdef HAVE_NET_PFVAR_H
+static int
+pfreason_to_num(const char *reason)
+{
+	const char *reasons[] = PFRES_NAMES;
+	int i;
+
+	for (i = 0; reasons[i]; i++) {
+		if (pcap_strcasecmp(reason, reasons[i]) == 0)
+			return (i);
+	}
+	bpf_error("unknown PF reason");
+	/*NOTREACHED*/
+}
+
+static int
+pfaction_to_num(const char *action)
+{
+	if (pcap_strcasecmp(action, "pass") == 0 ||
+	    pcap_strcasecmp(action, "accept") == 0)
+		return (PF_PASS);
+	else if (pcap_strcasecmp(action, "drop") == 0 ||
+		pcap_strcasecmp(action, "block") == 0)
+		return (PF_DROP);
+	else {
+		bpf_error("unknown PF action");
+		/*NOTREACHED*/
+	}
+}
+#else /* !HAVE_NET_PFVAR_H */
+static int
+pfreason_to_num(const char *reason)
+{
+	bpf_error("libpcap was compiled on a machine without pf support");
+	/*NOTREACHED*/
+}
+
+static int
+pfaction_to_num(const char *action)
+{
+	bpf_error("libpcap was compiled on a machine without pf support");
+	/*NOTREACHED*/
+}
+#endif /* HAVE_NET_PFVAR_H */
 %}
 
 %union {
@@ -351,28 +399,10 @@
 	;
 
 reason:	  NUM			{ $$ = $1; }
-	| ID			{ const char *reasons[] = PFRES_NAMES;
-				  int i;
-				  for (i = 0; reasons[i]; i++) {
-					  if (pcap_strcasecmp($1, reasons[i]) == 0) {
-						  $$ = i;
-						  break;
-					  }
-				  }
-				  if (reasons[i] == NULL)
-					  bpf_error("unknown PF reason");
-				}
+	| ID			{ $$ = pfreason_to_num($1); }
 	;
 
-action:	  ID			{ if (pcap_strcasecmp($1, "pass") == 0 ||
-				      pcap_strcasecmp($1, "accept") == 0)
-					$$ = PF_PASS;
-				  else if (pcap_strcasecmp($1, "drop") == 0 ||
-				      pcap_strcasecmp($1, "block") == 0)
-					$$ = PF_DROP;
-				  else
-					  bpf_error("unknown PF action");
-				}
+action:	  ID			{ $$ = pfaction_to_num($1); }
 	;
 
 relop:	  '>'			{ $$ = BPF_JGT; }
Index: Win32/Src/gai_strerror.c
===================================================================
--- Win32/Src/gai_strerror.c	(revision 3422)
+++ Win32/Src/gai_strerror.c	(working copy)
@@ -67,6 +67,11 @@
 #define EAI_MAX (sizeof(ai_errlist)/sizeof(ai_errlist[0]))
 #endif
 
+/* on MingW, gai_strerror is available. 
+   We need to compile gai_strerrorA only for Cygwin
+ */
+#ifndef gai_strerror
+
 char *
 WSAAPI gai_strerrorA(int ecode)
 {
@@ -75,3 +80,4 @@
 	return "Unknown error";
 }
 
+#endif /* gai_strerror */
\ No newline at end of file
Index: Win32/Src/CVS/Entries
===================================================================
--- Win32/Src/CVS/Entries	(revision 3422)
+++ Win32/Src/CVS/Entries	(working copy)
@@ -7,5 +7,5 @@
 /inet_aton.c/1.2/Sat Nov 15 23:24:06 2003//Tlibpcap_0_9
 /inet_net.c/1.1/Thu Aug  1 08:33:10 2002//Tlibpcap_0_9
 /inet_pton.c/1.2/Sat Nov 15 23:24:06 2003//Tlibpcap_0_9
-/gai_strerror.c/1.1.2.1/Sun Jan 22 18:14:17 2006//Tlibpcap_0_9
+/gai_strerror.c/1.1.2.2/Wed Sep 26 02:09:47 2007//Tlibpcap_0_9
 D
Index: pcap.c
===================================================================
--- pcap.c	(revision 3422)
+++ pcap.c	(working copy)
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.88.2.17 2007/06/22 06:43:58 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.88.2.19 2007/09/19 02:50:52 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -240,7 +240,7 @@
 		**dlt_buffer = p->linktype;
 		return (1);
 	} else {
-		*dlt_buffer = (int*)malloc(sizeof(**dlt_buffer) * p->dlt_count);
+		*dlt_buffer = (int*)calloc(sizeof(**dlt_buffer), p->dlt_count);
 		if (*dlt_buffer == NULL) {
 			(void)snprintf(p->errbuf, sizeof(p->errbuf),
 			    "malloc: %s", pcap_strerror(errno));
@@ -817,7 +817,7 @@
 #ifdef HAVE_VERSION_H
 #include "version.h"
 #else
-static const char pcap_version_string[] = "libpcap version 0.9.7";
+static const char pcap_version_string[] = "libpcap version 0.9.8";
 #endif
 
 #ifdef WIN32
Index: CHANGES
===================================================================
--- CHANGES	(revision 3422)
+++ CHANGES	(working copy)
@@ -1,5 +1,12 @@
-@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.11 2007/07/24 02:27:32 mcr Exp $ (LBL)
+@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.13 2007/09/12 22:40:04 ken Exp $ (LBL)
 
+Mon.	September 10, 2007.  ken@xelerance.com.  Summary for 0.9.8 libpcap release
+	Change build process to put public libpcap headers into pcap subir
+	DLT: Add value for IPMI IPMB packets
+	DLT: Add value for u10 Networks boards
+	Require <net/pfvar.h> for pf definitions - allows reading of pflog formatted 
+	 libpcap files on an OS other than where the file was generated
+
 Wed.	July 23, 2007.  mcr@xelerance.com.  Summary for 0.9.7 libpcap release
 
 	FIXED version file to be 0.9.7 instead of 0.9.5.
Index: pcap-bpf.h
===================================================================
--- pcap-bpf.h	(revision 3422)
+++ pcap-bpf.h	(working copy)
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.h       7.1 (Berkeley) 5/7/91
  *
- * @(#) $Header: /tcpdump/master/libpcap/pcap-bpf.h,v 1.34.2.20 2007/07/19 06:20:53 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap-bpf.h,v 1.34.2.24 2007/09/19 02:52:12 guy Exp $ (LBL)
  */
 
 /*
@@ -132,7 +132,7 @@
 #define DLT_AX25	3	/* Amateur Radio AX.25 */
 #define DLT_PRONET	4	/* Proteon ProNET Token Ring */
 #define DLT_CHAOS	5	/* Chaos */
-#define DLT_IEEE802	6	/* IEEE 802 Networks */
+#define DLT_IEEE802	6	/* 802.5 Token Ring */
 #define DLT_ARCNET	7	/* ARCNET, with BSD-style header */
 #define DLT_SLIP	8	/* Serial Line IP */
 #define DLT_PPP		9	/* Point-to-point Protocol */
@@ -707,8 +707,42 @@
  */
 #define DLT_SITA		196
 
+/*
+ * Various link-layer types, with a pseudo-header, for Endace DAG cards;
+ * encapsulates Endace ERF records.  Requested by Stephen Donnelly
+ * <stephen@endace.com>.
+ */
+#define DLT_ERF			197
 
 /*
+ * Special header prepended to Ethernet packets when capturing from a
+ * u10 Networks board.  Requested by Phil Mulholland
+ * <phil@u10networks.com>.
+ */
+#define DLT_RAIF1		198
+
+/*
+ * IPMB packet for IPMI, beginning with the I2C slave address, followed
+ * by the netFn and LUN, etc..  Requested by Chanthy Toeung
+ * <chanthy.toeung@ca.kontron.com>.
+ */
+#define DLT_IPMB		199
+
+/*
+ * Juniper-private data link type, as per request from
+ * Hannes Gredler <hannes@juniper.net>. 
+ * The DLT_ is used for capturing data on a secure tunnel interface.
+ */
+#define DLT_JUNIPER_ST          200
+
+/*
+ * Bluetooth HCI UART transport layer (part H:4), with pseudo-header
+ * that includes direction information; requested by Paolo Abeni.
+ */
+#define DLT_BLUETOOTH_HCI_H4_WITH_PHDR	201
+
+
+/*
  * The instruction encodings.
  */
 /* instruction classes */
Index: fad-getad.c
===================================================================
--- fad-getad.c	(revision 3422)
+++ fad-getad.c	(working copy)
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/fad-getad.c,v 1.10.2.1 2005/04/10 18:04:49 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/fad-getad.c,v 1.10.2.2 2007/09/14 00:45:17 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -61,7 +61,11 @@
 #endif
 
 #ifdef AF_PACKET
-# include <linux/if_packet.h>
+# ifdef __Lynx__
+#  include <netpacket/if_packet.h>	/* LynxOS */
+# else
+#  include <linux/if_packet.h>		/* Linux */
+# endif
 #endif
 
 /*
Index: FILES
===================================================================
--- FILES	(revision 3422)
+++ FILES	(working copy)
@@ -97,7 +97,6 @@
 pcap.3
 pcap.c
 pcap.h
-pf.h
 ppp.h
 savefile.c
 scanner.l
Index: autom4te.cache/traces.0
===================================================================
--- autom4te.cache/traces.0	(revision 3422)
+++ autom4te.cache/traces.0	(working copy)
@@ -330,247 +330,249 @@
 #undef HAVE_STDINT_H])
 m4trace:configure.in:29: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H])
-m4trace:configure.in:30: -1- AH_OUTPUT([HAVE_NETINET_IF_ETHER_H], [/* Define to 1 if you have the <netinet/if_ether.h> header file. */
+m4trace:configure.in:30: -1- AH_OUTPUT([HAVE_NET_PFVAR_H], [/* Define to 1 if you have the <net/pfvar.h> header file. */
+#undef HAVE_NET_PFVAR_H])
+m4trace:configure.in:33: -1- AH_OUTPUT([HAVE_NETINET_IF_ETHER_H], [/* Define to 1 if you have the <netinet/if_ether.h> header file. */
 #undef HAVE_NETINET_IF_ETHER_H])
-m4trace:configure.in:42: -1- AH_OUTPUT([HAVE_NETINET_IF_ETHER_H], [/* Define to 1 if you have the <netinet/if_ether.h> header file. */
+m4trace:configure.in:45: -1- AH_OUTPUT([HAVE_NETINET_IF_ETHER_H], [/* Define to 1 if you have the <netinet/if_ether.h> header file. */
 #undef HAVE_NETINET_IF_ETHER_H])
-m4trace:configure.in:50: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+m4trace:configure.in:53: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from...
 aclocal.m4:326: AC_LBL_FIXINCLUDES is expanded from...
-configure.in:50: the top level])
-m4trace:configure.in:52: -1- AH_OUTPUT([HAVE_STRERROR], [/* Define to 1 if you have the `strerror\' function. */
+configure.in:53: the top level])
+m4trace:configure.in:55: -1- AH_OUTPUT([HAVE_STRERROR], [/* Define to 1 if you have the `strerror\' function. */
 #undef HAVE_STRERROR])
-m4trace:configure.in:52: -1- AH_OUTPUT([HAVE_STRLCPY], [/* Define to 1 if you have the `strlcpy\' function. */
+m4trace:configure.in:55: -1- AH_OUTPUT([HAVE_STRLCPY], [/* Define to 1 if you have the `strlcpy\' function. */
 #undef HAVE_STRLCPY])
-m4trace:configure.in:55: -1- AH_OUTPUT([HAVE_VSNPRINTF], [/* Define to 1 if you have the `vsnprintf\' function. */
+m4trace:configure.in:58: -1- AH_OUTPUT([HAVE_VSNPRINTF], [/* Define to 1 if you have the `vsnprintf\' function. */
 #undef HAVE_VSNPRINTF])
-m4trace:configure.in:55: -1- AH_OUTPUT([HAVE_SNPRINTF], [/* Define to 1 if you have the `snprintf\' function. */
+m4trace:configure.in:58: -1- AH_OUTPUT([HAVE_SNPRINTF], [/* Define to 1 if you have the `snprintf\' function. */
 #undef HAVE_SNPRINTF])
-m4trace:configure.in:58: -1- AC_LIBSOURCE([snprintf.c])
-m4trace:configure.in:58: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS snprintf.$ac_objext"])
-m4trace:configure.in:58: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.in:58: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.in:78: -1- AH_OUTPUT([HAVE_ETHER_HOSTTON], [/* Define to 1 if you have the `ether_hostton\' function. */
+m4trace:configure.in:61: -1- AC_LIBSOURCE([snprintf.c])
+m4trace:configure.in:61: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS snprintf.$ac_objext"])
+m4trace:configure.in:61: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.in:61: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.in:81: -1- AH_OUTPUT([HAVE_ETHER_HOSTTON], [/* Define to 1 if you have the `ether_hostton\' function. */
 #undef HAVE_ETHER_HOSTTON])
-m4trace:configure.in:87: -1- AC_DEFINE_TRACE_LITERAL([NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON])
-m4trace:configure.in:87: -1- m4_pattern_allow([^NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON$])
-m4trace:configure.in:87: -1- AH_OUTPUT([NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON], [/* Define to 1 if netinet/if_ether.h declares `ether_hostton\' */
+m4trace:configure.in:90: -1- AC_DEFINE_TRACE_LITERAL([NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON])
+m4trace:configure.in:90: -1- m4_pattern_allow([^NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON$])
+m4trace:configure.in:90: -1- AH_OUTPUT([NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON], [/* Define to 1 if netinet/if_ether.h declares `ether_hostton\' */
 #undef NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON])
-m4trace:configure.in:110: -1- AH_OUTPUT([HAVE_NETINET_ETHER_H], [/* Define to 1 if you have the <netinet/ether.h> header file. */
+m4trace:configure.in:113: -1- AH_OUTPUT([HAVE_NETINET_ETHER_H], [/* Define to 1 if you have the <netinet/ether.h> header file. */
 #undef HAVE_NETINET_ETHER_H])
-m4trace:configure.in:119: -1- AC_DEFINE_TRACE_LITERAL([NETINET_ETHER_H_DECLARES_ETHER_HOSTTON])
-m4trace:configure.in:119: -1- m4_pattern_allow([^NETINET_ETHER_H_DECLARES_ETHER_HOSTTON$])
-m4trace:configure.in:119: -1- AH_OUTPUT([NETINET_ETHER_H_DECLARES_ETHER_HOSTTON], [/* Define to 1 if netinet/ether.h declares `ether_hostton\' */
+m4trace:configure.in:122: -1- AC_DEFINE_TRACE_LITERAL([NETINET_ETHER_H_DECLARES_ETHER_HOSTTON])
+m4trace:configure.in:122: -1- m4_pattern_allow([^NETINET_ETHER_H_DECLARES_ETHER_HOSTTON$])
+m4trace:configure.in:122: -1- AH_OUTPUT([NETINET_ETHER_H_DECLARES_ETHER_HOSTTON], [/* Define to 1 if netinet/ether.h declares `ether_hostton\' */
 #undef NETINET_ETHER_H_DECLARES_ETHER_HOSTTON])
-m4trace:configure.in:137: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_ETHER_ADDR])
-m4trace:configure.in:137: -1- m4_pattern_allow([^HAVE_STRUCT_ETHER_ADDR$])
-m4trace:configure.in:137: -1- AH_OUTPUT([HAVE_STRUCT_ETHER_ADDR], [/* Define to 1 if the system has the type `struct ether_addr\'. */
+m4trace:configure.in:140: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_ETHER_ADDR])
+m4trace:configure.in:140: -1- m4_pattern_allow([^HAVE_STRUCT_ETHER_ADDR$])
+m4trace:configure.in:140: -1- AH_OUTPUT([HAVE_STRUCT_ETHER_ADDR], [/* Define to 1 if the system has the type `struct ether_addr\'. */
 #undef HAVE_STRUCT_ETHER_ADDR])
-m4trace:configure.in:148: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_ETHER_HOSTTON])
-m4trace:configure.in:148: -1- m4_pattern_allow([^HAVE_DECL_ETHER_HOSTTON$])
-m4trace:configure.in:148: -1- AH_OUTPUT([HAVE_DECL_ETHER_HOSTTON], [/* Define to 1 if you have the declaration of `ether_hostton\', and to 0 if you
+m4trace:configure.in:151: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_ETHER_HOSTTON])
+m4trace:configure.in:151: -1- m4_pattern_allow([^HAVE_DECL_ETHER_HOSTTON$])
+m4trace:configure.in:151: -1- AH_OUTPUT([HAVE_DECL_ETHER_HOSTTON], [/* Define to 1 if you have the declaration of `ether_hostton\', and to 0 if you
    don\'t. */
 #undef HAVE_DECL_ETHER_HOSTTON])
-m4trace:configure.in:152: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_ETHER_HOSTTON])
-m4trace:configure.in:152: -1- m4_pattern_allow([^HAVE_DECL_ETHER_HOSTTON$])
-m4trace:configure.in:152: -1- AH_OUTPUT([HAVE_DECL_ETHER_HOSTTON], [/* Define to 1 if you have the declaration of `ether_hostton\', and to 0 if you
+m4trace:configure.in:155: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_ETHER_HOSTTON])
+m4trace:configure.in:155: -1- m4_pattern_allow([^HAVE_DECL_ETHER_HOSTTON$])
+m4trace:configure.in:155: -1- AH_OUTPUT([HAVE_DECL_ETHER_HOSTTON], [/* Define to 1 if you have the declaration of `ether_hostton\', and to 0 if you
    don\'t. */
 #undef HAVE_DECL_ETHER_HOSTTON])
-m4trace:configure.in:168: -1- AC_DEFINE_TRACE_LITERAL([NO_PROTOCHAIN])
-m4trace:configure.in:168: -1- m4_pattern_allow([^NO_PROTOCHAIN$])
-m4trace:configure.in:168: -1- AH_OUTPUT([NO_PROTOCHAIN], [/* do not use protochain */
+m4trace:configure.in:171: -1- AC_DEFINE_TRACE_LITERAL([NO_PROTOCHAIN])
+m4trace:configure.in:171: -1- m4_pattern_allow([^NO_PROTOCHAIN$])
+m4trace:configure.in:171: -1- AH_OUTPUT([NO_PROTOCHAIN], [/* do not use protochain */
 #undef NO_PROTOCHAIN])
-m4trace:configure.in:192: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CLONING_BPF])
-m4trace:configure.in:192: -1- m4_pattern_allow([^HAVE_CLONING_BPF$])
-m4trace:configure.in:192: -1- AH_OUTPUT([HAVE_CLONING_BPF], [/* define if you have a cloning BPF device */
+m4trace:configure.in:195: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CLONING_BPF])
+m4trace:configure.in:195: -1- m4_pattern_allow([^HAVE_CLONING_BPF$])
+m4trace:configure.in:195: -1- AH_OUTPUT([HAVE_CLONING_BPF], [/* define if you have a cloning BPF device */
 #undef HAVE_CLONING_BPF])
-m4trace:configure.in:240: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+m4trace:configure.in:243: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from...
 ../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from...
 ../../lib/autoconf/functions.m4:67: AC_CHECK_FUNC is expanded from...
-configure.in:240: the top level])
-m4trace:configure.in:314: -1- AC_DEFINE_TRACE_LITERAL([INET6])
-m4trace:configure.in:314: -1- m4_pattern_allow([^INET6$])
-m4trace:configure.in:314: -1- AH_OUTPUT([INET6], [/* IPv6 */
+configure.in:243: the top level])
+m4trace:configure.in:317: -1- AC_DEFINE_TRACE_LITERAL([INET6])
+m4trace:configure.in:317: -1- m4_pattern_allow([^INET6$])
+m4trace:configure.in:317: -1- AH_OUTPUT([INET6], [/* IPv6 */
 #undef INET6])
-m4trace:configure.in:321: -1- AC_DEFINE_TRACE_LITERAL([BDEBUG])
-m4trace:configure.in:321: -1- m4_pattern_allow([^BDEBUG$])
-m4trace:configure.in:321: -1- AH_OUTPUT([BDEBUG], [/* Enable optimizer debugging */
+m4trace:configure.in:324: -1- AC_DEFINE_TRACE_LITERAL([BDEBUG])
+m4trace:configure.in:324: -1- m4_pattern_allow([^BDEBUG$])
+m4trace:configure.in:324: -1- AH_OUTPUT([BDEBUG], [/* Enable optimizer debugging */
 #undef BDEBUG])
-m4trace:configure.in:328: -1- AC_DEFINE_TRACE_LITERAL([YYDEBUG])
-m4trace:configure.in:328: -1- m4_pattern_allow([^YYDEBUG$])
-m4trace:configure.in:328: -1- AH_OUTPUT([YYDEBUG], [/* Enable parser debugging */
+m4trace:configure.in:331: -1- AC_DEFINE_TRACE_LITERAL([YYDEBUG])
+m4trace:configure.in:331: -1- m4_pattern_allow([^YYDEBUG$])
+m4trace:configure.in:331: -1- AH_OUTPUT([YYDEBUG], [/* Enable parser debugging */
 #undef YYDEBUG])
-m4trace:configure.in:335: -1- AH_OUTPUT([HAVE_SYS_BUFMOD_H], [/* Define to 1 if you have the <sys/bufmod.h> header file. */
+m4trace:configure.in:338: -1- AH_OUTPUT([HAVE_SYS_BUFMOD_H], [/* Define to 1 if you have the <sys/bufmod.h> header file. */
 #undef HAVE_SYS_BUFMOD_H])
-m4trace:configure.in:335: -1- AH_OUTPUT([HAVE_SYS_DLPI_EXT_H], [/* Define to 1 if you have the <sys/dlpi_ext.h> header file. */
+m4trace:configure.in:338: -1- AH_OUTPUT([HAVE_SYS_DLPI_EXT_H], [/* Define to 1 if you have the <sys/dlpi_ext.h> header file. */
 #undef HAVE_SYS_DLPI_EXT_H])
-m4trace:configure.in:339: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DEV_DLPI])
-m4trace:configure.in:339: -1- m4_pattern_allow([^HAVE_DEV_DLPI$])
-m4trace:configure.in:339: -1- AH_OUTPUT([HAVE_DEV_DLPI], [/* define if you have a /dev/dlpi */
+m4trace:configure.in:342: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DEV_DLPI])
+m4trace:configure.in:342: -1- m4_pattern_allow([^HAVE_DEV_DLPI$])
+m4trace:configure.in:342: -1- AH_OUTPUT([HAVE_DEV_DLPI], [/* define if you have a /dev/dlpi */
 #undef HAVE_DEV_DLPI])
-m4trace:configure.in:346: -1- AC_DEFINE_TRACE_LITERAL([PCAP_DEV_PREFIX])
-m4trace:configure.in:346: -1- m4_pattern_allow([^PCAP_DEV_PREFIX$])
-m4trace:configure.in:346: -1- AH_OUTPUT([PCAP_DEV_PREFIX], [/* /dev/dlpi directory */
+m4trace:configure.in:349: -1- AC_DEFINE_TRACE_LITERAL([PCAP_DEV_PREFIX])
+m4trace:configure.in:349: -1- m4_pattern_allow([^PCAP_DEV_PREFIX$])
+m4trace:configure.in:349: -1- AH_OUTPUT([PCAP_DEV_PREFIX], [/* /dev/dlpi directory */
 #undef PCAP_DEV_PREFIX])
-m4trace:configure.in:370: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+m4trace:configure.in:373: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from...
 aclocal.m4:889: AC_LBL_TPACKET_STATS is expanded from...
-configure.in:370: the top level])
-m4trace:configure.in:370: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TPACKET_STATS])
-m4trace:configure.in:370: -1- m4_pattern_allow([^HAVE_TPACKET_STATS$])
-m4trace:configure.in:370: -1- AH_OUTPUT([HAVE_TPACKET_STATS], [/* if if_packet.h has tpacket_stats defined */
+configure.in:373: the top level])
+m4trace:configure.in:373: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TPACKET_STATS])
+m4trace:configure.in:373: -1- m4_pattern_allow([^HAVE_TPACKET_STATS$])
+m4trace:configure.in:373: -1- AH_OUTPUT([HAVE_TPACKET_STATS], [/* if if_packet.h has tpacket_stats defined */
 #undef HAVE_TPACKET_STATS])
-m4trace:configure.in:395: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PROC_NET_DEV])
-m4trace:configure.in:395: -1- m4_pattern_allow([^HAVE_PROC_NET_DEV$])
-m4trace:configure.in:395: -1- AH_OUTPUT([HAVE_PROC_NET_DEV], [/* define if you have a /proc/net/dev */
+m4trace:configure.in:398: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PROC_NET_DEV])
+m4trace:configure.in:398: -1- m4_pattern_allow([^HAVE_PROC_NET_DEV$])
+m4trace:configure.in:398: -1- AH_OUTPUT([HAVE_PROC_NET_DEV], [/* define if you have a /proc/net/dev */
 #undef HAVE_PROC_NET_DEV])
-m4trace:configure.in:591: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DAG_GET_ERF_TYPES])
-m4trace:configure.in:591: -1- m4_pattern_allow([^HAVE_DAG_GET_ERF_TYPES$])
-m4trace:configure.in:591: -1- AH_OUTPUT([HAVE_DAG_GET_ERF_TYPES], [/* define if you have dag_get_erf_types() */
+m4trace:configure.in:594: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DAG_GET_ERF_TYPES])
+m4trace:configure.in:594: -1- m4_pattern_allow([^HAVE_DAG_GET_ERF_TYPES$])
+m4trace:configure.in:594: -1- AH_OUTPUT([HAVE_DAG_GET_ERF_TYPES], [/* define if you have dag_get_erf_types() */
 #undef HAVE_DAG_GET_ERF_TYPES])
-m4trace:configure.in:597: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DAG_STREAMS_API])
-m4trace:configure.in:597: -1- m4_pattern_allow([^HAVE_DAG_STREAMS_API$])
-m4trace:configure.in:597: -1- AH_OUTPUT([HAVE_DAG_STREAMS_API], [/* define if you have streams capable DAG API */
+m4trace:configure.in:600: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DAG_STREAMS_API])
+m4trace:configure.in:600: -1- m4_pattern_allow([^HAVE_DAG_STREAMS_API$])
+m4trace:configure.in:600: -1- AH_OUTPUT([HAVE_DAG_STREAMS_API], [/* define if you have streams capable DAG API */
 #undef HAVE_DAG_STREAMS_API])
-m4trace:configure.in:607: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DAG_API])
-m4trace:configure.in:607: -1- m4_pattern_allow([^HAVE_DAG_API$])
-m4trace:configure.in:607: -1- AH_OUTPUT([HAVE_DAG_API], [/* define if you have the DAG API */
+m4trace:configure.in:610: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DAG_API])
+m4trace:configure.in:610: -1- m4_pattern_allow([^HAVE_DAG_API$])
+m4trace:configure.in:610: -1- AH_OUTPUT([HAVE_DAG_API], [/* define if you have the DAG API */
 #undef HAVE_DAG_API])
-m4trace:configure.in:697: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SEPTEL_API])
-m4trace:configure.in:697: -1- m4_pattern_allow([^HAVE_SEPTEL_API$])
-m4trace:configure.in:697: -1- AH_OUTPUT([HAVE_SEPTEL_API], [/* define if you have a Septel API */
+m4trace:configure.in:700: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SEPTEL_API])
+m4trace:configure.in:700: -1- m4_pattern_allow([^HAVE_SEPTEL_API$])
+m4trace:configure.in:700: -1- AH_OUTPUT([HAVE_SEPTEL_API], [/* define if you have a Septel API */
 #undef HAVE_SEPTEL_API])
-m4trace:configure.in:706: -1- AC_SUBST([V_LEX])
-m4trace:configure.in:706: -1- AC_SUBST_TRACE([V_LEX])
-m4trace:configure.in:706: -1- m4_pattern_allow([^V_LEX$])
-m4trace:configure.in:706: -1- AC_SUBST([V_YACC])
-m4trace:configure.in:706: -1- AC_SUBST_TRACE([V_YACC])
-m4trace:configure.in:706: -1- m4_pattern_allow([^V_YACC$])
-m4trace:configure.in:729: -1- AC_DEFINE_TRACE_LITERAL([_SUN])
-m4trace:configure.in:729: -1- m4_pattern_allow([^_SUN$])
-m4trace:configure.in:729: -1- AH_OUTPUT([_SUN], [/* define on AIX to get certain functions */
+m4trace:configure.in:709: -1- AC_SUBST([V_LEX])
+m4trace:configure.in:709: -1- AC_SUBST_TRACE([V_LEX])
+m4trace:configure.in:709: -1- m4_pattern_allow([^V_LEX$])
+m4trace:configure.in:709: -1- AC_SUBST([V_YACC])
+m4trace:configure.in:709: -1- AC_SUBST_TRACE([V_YACC])
+m4trace:configure.in:709: -1- m4_pattern_allow([^V_YACC$])
+m4trace:configure.in:732: -1- AC_DEFINE_TRACE_LITERAL([_SUN])
+m4trace:configure.in:732: -1- m4_pattern_allow([^_SUN$])
+m4trace:configure.in:732: -1- AH_OUTPUT([_SUN], [/* define on AIX to get certain functions */
 #undef _SUN])
-m4trace:configure.in:733: -1- AC_DEFINE_TRACE_LITERAL([HAVE_HPUX9])
-m4trace:configure.in:733: -1- m4_pattern_allow([^HAVE_HPUX9$])
-m4trace:configure.in:733: -1- AH_OUTPUT([HAVE_HPUX9], [/* on HP-UX 9.x */
+m4trace:configure.in:736: -1- AC_DEFINE_TRACE_LITERAL([HAVE_HPUX9])
+m4trace:configure.in:736: -1- m4_pattern_allow([^HAVE_HPUX9$])
+m4trace:configure.in:736: -1- AH_OUTPUT([HAVE_HPUX9], [/* on HP-UX 9.x */
 #undef HAVE_HPUX9])
-m4trace:configure.in:749: -1- AC_DEFINE_TRACE_LITERAL([HAVE_HPUX10_20_OR_LATER])
-m4trace:configure.in:749: -1- m4_pattern_allow([^HAVE_HPUX10_20_OR_LATER$])
-m4trace:configure.in:749: -1- AH_OUTPUT([HAVE_HPUX10_20_OR_LATER], [/* on HP-UX 10.20 or later */
+m4trace:configure.in:752: -1- AC_DEFINE_TRACE_LITERAL([HAVE_HPUX10_20_OR_LATER])
+m4trace:configure.in:752: -1- m4_pattern_allow([^HAVE_HPUX10_20_OR_LATER$])
+m4trace:configure.in:752: -1- AH_OUTPUT([HAVE_HPUX10_20_OR_LATER], [/* on HP-UX 10.20 or later */
 #undef HAVE_HPUX10_20_OR_LATER])
-m4trace:configure.in:755: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+m4trace:configure.in:758: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from...
-configure.in:755: the top level])
-m4trace:configure.in:762: -1- AC_DEFINE_TRACE_LITERAL([sinix])
-m4trace:configure.in:762: -1- m4_pattern_allow([^sinix$])
-m4trace:configure.in:762: -1- AH_OUTPUT([sinix], [/* on sinix */
+configure.in:758: the top level])
+m4trace:configure.in:765: -1- AC_DEFINE_TRACE_LITERAL([sinix])
+m4trace:configure.in:765: -1- m4_pattern_allow([^sinix$])
+m4trace:configure.in:765: -1- AH_OUTPUT([sinix], [/* on sinix */
 #undef sinix])
-m4trace:configure.in:767: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SOLARIS])
-m4trace:configure.in:767: -1- m4_pattern_allow([^HAVE_SOLARIS$])
-m4trace:configure.in:767: -1- AH_OUTPUT([HAVE_SOLARIS], [/* On solaris */
+m4trace:configure.in:770: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SOLARIS])
+m4trace:configure.in:770: -1- m4_pattern_allow([^HAVE_SOLARIS$])
+m4trace:configure.in:770: -1- AH_OUTPUT([HAVE_SOLARIS], [/* On solaris */
 #undef HAVE_SOLARIS])
-m4trace:configure.in:781: -1- AC_SUBST([RANLIB])
-m4trace:configure.in:781: -1- AC_SUBST_TRACE([RANLIB])
-m4trace:configure.in:781: -1- m4_pattern_allow([^RANLIB$])
-m4trace:configure.in:783: -1- AC_DEFINE_TRACE_LITERAL([HAVE_OS_PROTO_H])
-m4trace:configure.in:783: -1- m4_pattern_allow([^HAVE_OS_PROTO_H$])
-m4trace:configure.in:783: -1- AH_OUTPUT([HAVE_OS_PROTO_H], [/* if there\'s an os_proto.h */
+m4trace:configure.in:784: -1- AC_SUBST([RANLIB])
+m4trace:configure.in:784: -1- AC_SUBST_TRACE([RANLIB])
+m4trace:configure.in:784: -1- m4_pattern_allow([^RANLIB$])
+m4trace:configure.in:786: -1- AC_DEFINE_TRACE_LITERAL([HAVE_OS_PROTO_H])
+m4trace:configure.in:786: -1- m4_pattern_allow([^HAVE_OS_PROTO_H$])
+m4trace:configure.in:786: -1- AH_OUTPUT([HAVE_OS_PROTO_H], [/* if there\'s an os_proto.h */
 #undef HAVE_OS_PROTO_H])
-m4trace:configure.in:785: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+m4trace:configure.in:788: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from...
 aclocal.m4:454: AC_LBL_SOCKADDR_SA_LEN is expanded from...
-configure.in:785: the top level])
-m4trace:configure.in:785: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SOCKADDR_SA_LEN])
-m4trace:configure.in:785: -1- m4_pattern_allow([^HAVE_SOCKADDR_SA_LEN$])
-m4trace:configure.in:785: -1- AH_OUTPUT([HAVE_SOCKADDR_SA_LEN], [/* if struct sockaddr has sa_len */
+configure.in:788: the top level])
+m4trace:configure.in:788: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SOCKADDR_SA_LEN])
+m4trace:configure.in:788: -1- m4_pattern_allow([^HAVE_SOCKADDR_SA_LEN$])
+m4trace:configure.in:788: -1- AH_OUTPUT([HAVE_SOCKADDR_SA_LEN], [/* if struct sockaddr has sa_len */
 #undef HAVE_SOCKADDR_SA_LEN])
-m4trace:configure.in:787: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+m4trace:configure.in:790: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from...
 aclocal.m4:479: AC_LBL_SOCKADDR_STORAGE is expanded from...
-configure.in:787: the top level])
-m4trace:configure.in:787: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SOCKADDR_STORAGE])
-m4trace:configure.in:787: -1- m4_pattern_allow([^HAVE_SOCKADDR_STORAGE$])
-m4trace:configure.in:787: -1- AH_OUTPUT([HAVE_SOCKADDR_STORAGE], [/* if struct sockaddr_storage exists */
+configure.in:790: the top level])
+m4trace:configure.in:790: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SOCKADDR_STORAGE])
+m4trace:configure.in:790: -1- m4_pattern_allow([^HAVE_SOCKADDR_STORAGE$])
+m4trace:configure.in:790: -1- AH_OUTPUT([HAVE_SOCKADDR_STORAGE], [/* if struct sockaddr_storage exists */
 #undef HAVE_SOCKADDR_STORAGE])
-m4trace:configure.in:789: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+m4trace:configure.in:792: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from...
 aclocal.m4:512: AC_LBL_HP_PPA_INFO_T_DL_MODULE_ID_1 is expanded from...
-configure.in:789: the top level])
-m4trace:configure.in:789: -1- AC_DEFINE_TRACE_LITERAL([HAVE_HP_PPA_INFO_T_DL_MODULE_ID_1])
-m4trace:configure.in:789: -1- m4_pattern_allow([^HAVE_HP_PPA_INFO_T_DL_MODULE_ID_1$])
-m4trace:configure.in:789: -1- AH_OUTPUT([HAVE_HP_PPA_INFO_T_DL_MODULE_ID_1], [/* if ppa_info_t_dl_module_id exists */
+configure.in:792: the top level])
+m4trace:configure.in:792: -1- AC_DEFINE_TRACE_LITERAL([HAVE_HP_PPA_INFO_T_DL_MODULE_ID_1])
+m4trace:configure.in:792: -1- m4_pattern_allow([^HAVE_HP_PPA_INFO_T_DL_MODULE_ID_1$])
+m4trace:configure.in:792: -1- AH_OUTPUT([HAVE_HP_PPA_INFO_T_DL_MODULE_ID_1], [/* if ppa_info_t_dl_module_id exists */
 #undef HAVE_HP_PPA_INFO_T_DL_MODULE_ID_1])
-m4trace:configure.in:791: -1- AC_DEFINE_TRACE_LITERAL([LBL_ALIGN])
-m4trace:configure.in:791: -1- m4_pattern_allow([^LBL_ALIGN$])
-m4trace:configure.in:791: -1- AH_OUTPUT([LBL_ALIGN], [/* if unaligned access fails */
+m4trace:configure.in:794: -1- AC_DEFINE_TRACE_LITERAL([LBL_ALIGN])
+m4trace:configure.in:794: -1- m4_pattern_allow([^LBL_ALIGN$])
+m4trace:configure.in:794: -1- AH_OUTPUT([LBL_ALIGN], [/* if unaligned access fails */
 #undef LBL_ALIGN])
-m4trace:configure.in:797: -1- AC_DEFINE_TRACE_LITERAL([HAVE_VERSION_H])
-m4trace:configure.in:797: -1- m4_pattern_allow([^HAVE_VERSION_H$])
-m4trace:configure.in:797: -1- AH_OUTPUT([HAVE_VERSION_H], [/* define if version.h is generated in the build procedure */
+m4trace:configure.in:800: -1- AC_DEFINE_TRACE_LITERAL([HAVE_VERSION_H])
+m4trace:configure.in:800: -1- m4_pattern_allow([^HAVE_VERSION_H$])
+m4trace:configure.in:800: -1- AH_OUTPUT([HAVE_VERSION_H], [/* define if version.h is generated in the build procedure */
 #undef HAVE_VERSION_H])
-m4trace:configure.in:802: -1- AC_SUBST([V_CCOPT])
-m4trace:configure.in:802: -1- AC_SUBST_TRACE([V_CCOPT])
-m4trace:configure.in:802: -1- m4_pattern_allow([^V_CCOPT$])
-m4trace:configure.in:803: -1- AC_SUBST([V_DEFS])
-m4trace:configure.in:803: -1- AC_SUBST_TRACE([V_DEFS])
-m4trace:configure.in:803: -1- m4_pattern_allow([^V_DEFS$])
-m4trace:configure.in:804: -1- AC_SUBST([V_INCLS])
-m4trace:configure.in:804: -1- AC_SUBST_TRACE([V_INCLS])
-m4trace:configure.in:804: -1- m4_pattern_allow([^V_INCLS$])
-m4trace:configure.in:805: -1- AC_SUBST([V_LIBS])
-m4trace:configure.in:805: -1- AC_SUBST_TRACE([V_LIBS])
-m4trace:configure.in:805: -1- m4_pattern_allow([^V_LIBS$])
-m4trace:configure.in:806: -1- AC_SUBST([V_LEX])
-m4trace:configure.in:806: -1- AC_SUBST_TRACE([V_LEX])
-m4trace:configure.in:806: -1- m4_pattern_allow([^V_LEX$])
-m4trace:configure.in:807: -1- AC_SUBST([V_PCAP])
-m4trace:configure.in:807: -1- AC_SUBST_TRACE([V_PCAP])
-m4trace:configure.in:807: -1- m4_pattern_allow([^V_PCAP$])
-m4trace:configure.in:808: -1- AC_SUBST([V_FINDALLDEVS])
-m4trace:configure.in:808: -1- AC_SUBST_TRACE([V_FINDALLDEVS])
-m4trace:configure.in:808: -1- m4_pattern_allow([^V_FINDALLDEVS$])
-m4trace:configure.in:809: -1- AC_SUBST([V_RANLIB])
-m4trace:configure.in:809: -1- AC_SUBST_TRACE([V_RANLIB])
-m4trace:configure.in:809: -1- m4_pattern_allow([^V_RANLIB$])
-m4trace:configure.in:810: -1- AC_SUBST([V_YACC])
-m4trace:configure.in:810: -1- AC_SUBST_TRACE([V_YACC])
-m4trace:configure.in:810: -1- m4_pattern_allow([^V_YACC$])
-m4trace:configure.in:811: -1- AC_SUBST([SSRC])
-m4trace:configure.in:811: -1- AC_SUBST_TRACE([SSRC])
-m4trace:configure.in:811: -1- m4_pattern_allow([^SSRC$])
-m4trace:configure.in:812: -1- AC_SUBST([DYEXT])
-m4trace:configure.in:812: -1- AC_SUBST_TRACE([DYEXT])
-m4trace:configure.in:812: -1- m4_pattern_allow([^DYEXT$])
-m4trace:configure.in:813: -1- AC_SUBST([DAGLIBS])
-m4trace:configure.in:813: -1- AC_SUBST_TRACE([DAGLIBS])
-m4trace:configure.in:813: -1- m4_pattern_allow([^DAGLIBS$])
-m4trace:configure.in:815: -1- AC_REQUIRE_AUX_FILE([install-sh])
-m4trace:configure.in:815: -1- AC_SUBST([INSTALL_PROGRAM])
-m4trace:configure.in:815: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
-m4trace:configure.in:815: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-m4trace:configure.in:815: -1- AC_SUBST([INSTALL_SCRIPT])
-m4trace:configure.in:815: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
-m4trace:configure.in:815: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-m4trace:configure.in:815: -1- AC_SUBST([INSTALL_DATA])
-m4trace:configure.in:815: -1- AC_SUBST_TRACE([INSTALL_DATA])
-m4trace:configure.in:815: -1- m4_pattern_allow([^INSTALL_DATA$])
-m4trace:configure.in:817: -1- AC_CONFIG_HEADERS([config.h])
-m4trace:configure.in:819: -1- AC_CONFIG_FILES([Makefile])
-m4trace:configure.in:819: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+m4trace:configure.in:805: -1- AC_SUBST([V_CCOPT])
+m4trace:configure.in:805: -1- AC_SUBST_TRACE([V_CCOPT])
+m4trace:configure.in:805: -1- m4_pattern_allow([^V_CCOPT$])
+m4trace:configure.in:806: -1- AC_SUBST([V_DEFS])
+m4trace:configure.in:806: -1- AC_SUBST_TRACE([V_DEFS])
+m4trace:configure.in:806: -1- m4_pattern_allow([^V_DEFS$])
+m4trace:configure.in:807: -1- AC_SUBST([V_INCLS])
+m4trace:configure.in:807: -1- AC_SUBST_TRACE([V_INCLS])
+m4trace:configure.in:807: -1- m4_pattern_allow([^V_INCLS$])
+m4trace:configure.in:808: -1- AC_SUBST([V_LIBS])
+m4trace:configure.in:808: -1- AC_SUBST_TRACE([V_LIBS])
+m4trace:configure.in:808: -1- m4_pattern_allow([^V_LIBS$])
+m4trace:configure.in:809: -1- AC_SUBST([V_LEX])
+m4trace:configure.in:809: -1- AC_SUBST_TRACE([V_LEX])
+m4trace:configure.in:809: -1- m4_pattern_allow([^V_LEX$])
+m4trace:configure.in:810: -1- AC_SUBST([V_PCAP])
+m4trace:configure.in:810: -1- AC_SUBST_TRACE([V_PCAP])
+m4trace:configure.in:810: -1- m4_pattern_allow([^V_PCAP$])
+m4trace:configure.in:811: -1- AC_SUBST([V_FINDALLDEVS])
+m4trace:configure.in:811: -1- AC_SUBST_TRACE([V_FINDALLDEVS])
+m4trace:configure.in:811: -1- m4_pattern_allow([^V_FINDALLDEVS$])
+m4trace:configure.in:812: -1- AC_SUBST([V_RANLIB])
+m4trace:configure.in:812: -1- AC_SUBST_TRACE([V_RANLIB])
+m4trace:configure.in:812: -1- m4_pattern_allow([^V_RANLIB$])
+m4trace:configure.in:813: -1- AC_SUBST([V_YACC])
+m4trace:configure.in:813: -1- AC_SUBST_TRACE([V_YACC])
+m4trace:configure.in:813: -1- m4_pattern_allow([^V_YACC$])
+m4trace:configure.in:814: -1- AC_SUBST([SSRC])
+m4trace:configure.in:814: -1- AC_SUBST_TRACE([SSRC])
+m4trace:configure.in:814: -1- m4_pattern_allow([^SSRC$])
+m4trace:configure.in:815: -1- AC_SUBST([DYEXT])
+m4trace:configure.in:815: -1- AC_SUBST_TRACE([DYEXT])
+m4trace:configure.in:815: -1- m4_pattern_allow([^DYEXT$])
+m4trace:configure.in:816: -1- AC_SUBST([DAGLIBS])
+m4trace:configure.in:816: -1- AC_SUBST_TRACE([DAGLIBS])
+m4trace:configure.in:816: -1- m4_pattern_allow([^DAGLIBS$])
+m4trace:configure.in:818: -1- AC_REQUIRE_AUX_FILE([install-sh])
+m4trace:configure.in:818: -1- AC_SUBST([INSTALL_PROGRAM])
+m4trace:configure.in:818: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
+m4trace:configure.in:818: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
+m4trace:configure.in:818: -1- AC_SUBST([INSTALL_SCRIPT])
+m4trace:configure.in:818: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
+m4trace:configure.in:818: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
+m4trace:configure.in:818: -1- AC_SUBST([INSTALL_DATA])
+m4trace:configure.in:818: -1- AC_SUBST_TRACE([INSTALL_DATA])
+m4trace:configure.in:818: -1- m4_pattern_allow([^INSTALL_DATA$])
+m4trace:configure.in:820: -1- AC_CONFIG_HEADERS([config.h])
+m4trace:configure.in:822: -1- AC_CONFIG_FILES([Makefile])
+m4trace:configure.in:822: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
 You should run autoupdate.], [])
-m4trace:configure.in:819: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.in:819: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.in:819: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.in:819: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.in:819: -1- AC_SUBST_TRACE([LTLIBOBJS])
-m4trace:configure.in:819: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.in:819: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.in:819: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.in:819: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.in:819: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.in:819: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.in:819: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.in:819: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.in:819: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.in:819: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.in:822: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.in:822: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.in:822: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.in:822: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.in:822: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.in:822: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.in:822: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.in:822: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.in:822: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.in:822: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.in:822: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.in:822: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.in:822: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.in:822: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.in:822: -1- AC_SUBST_TRACE([INSTALL])
Index: autom4te.cache/requests
===================================================================
--- autom4te.cache/requests	(revision 3422)
+++ autom4te.cache/requests	(working copy)
@@ -15,15 +15,15 @@
                         'configure.in'
                       ],
                       {
+                        'AM_PROG_F77_C_O' => 1,
                         '_LT_AC_TAGCONFIG' => 1,
-                        'AM_PROG_F77_C_O' => 1,
+                        'm4_pattern_forbid' => 1,
                         'AC_INIT' => 1,
-                        'm4_pattern_forbid' => 1,
                         'AC_CANONICAL_TARGET' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
                         'AC_SUBST' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AC_CANONICAL_HOST' => 1,
                         'AC_FC_SRCEXT' => 1,
-                        'AC_CANONICAL_HOST' => 1,
                         'AC_PROG_LIBTOOL' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
                         'AC_CONFIG_SUBDIRS' => 1,
@@ -31,8 +31,8 @@
                         'LT_CONFIG_LTDL_DIR' => 1,
                         'AC_REQUIRE_AUX_FILE' => 1,
                         'AC_CONFIG_LINKS' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
                         'm4_sinclude' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
                         'AM_MAINTAINER_MODE' => 1,
                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
                         '_m4_warn' => 1,
@@ -49,11 +49,11 @@
                         'AH_OUTPUT' => 1,
                         '_AM_SUBST_NOTMAKE' => 1,
                         'AC_CONFIG_AUX_DIR' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'm4_pattern_allow' => 1,
                         'sinclude' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AM_PROG_CC_C_O' => 1,
+                        'AM_CONDITIONAL' => 1,
                         'AC_CANONICAL_SYSTEM' => 1,
-                        'AM_CONDITIONAL' => 1,
                         'AC_CONFIG_HEADERS' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
                         'm4_include' => 1,
Index: autom4te.cache/output.0
===================================================================
--- autom4te.cache/output.0	(revision 3422)
+++ autom4te.cache/output.0	(working copy)
@@ -1,5 +1,5 @@
 @%:@! /bin/sh
-@%:@ From configure.in Revision: 1.120.2.12 .
+@%:@ From configure.in Revision: 1.120.2.13 .
 @%:@ Guess values for system-dependent variables and create Makefiles.
 @%:@ Generated by GNU Autoconf 2.61.
 @%:@ 
@@ -4231,6 +4231,66 @@
 done
 
 
+for ac_header in net/pfvar.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+
+@%:@include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ 
+fi
+
+done
+
+
 for ac_header in netinet/if_ether.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`