From Albert Chin:

  1. aclocal.m4 patch required by Tru64 UNIX which has
     inttypes.h in a non-standard location so gcc cannot find
     the PRI types. So, use <sys/bitypes.h> to get u_int#_t
     types for help detecting %llx, etc.
  2. Help gcc on aix find ether_ntohost declaration.

diff --git a/aclocal.m4 b/aclocal.m4
index d63b2023f366039fd52413018b7051aeb71e5e26..2d5e46a34b24eeaa2b06fa9f8930316c8d60a59a 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/tcpdump/aclocal.m4,v 1.106.2.1 2005-04-20 09:46:43 guy Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/tcpdump/aclocal.m4,v 1.106.2.2 2005-04-20 09:51:03 guy Exp $ (LBL)
 dnl
 dnl Copyright (c) 1995, 1996, 1997, 1998
 dnl    The Regents of the University of California.  All rights reserved.
@@ -523,6 +523,9 @@ AC_DEFUN(AC_LBL_CHECK_64BIT_FORMAT,
          [[
 #          ifdef HAVE_INTTYPES_H
            #include <inttypes.h>
+#          endif
+#          ifdef HAVE_SYS_BITYPES_H
+            #include <sys/bitypes.h>
 #          endif
            #include <stdio.h>
            #include <sys/types.h>

diff --git a/configure b/configure
index 56b87c502bb7f90e35b5d5d7cd4198891df934f8..ace12ec3cd2225c7d0f84c503c44c5f8311e1f6c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.188.2.1 .
+# From configure.in Revision: 1.188.2.2 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.57.
 #
@@ -9090,6 +9090,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 struct mbuf;
 struct rtentry;
 #include <net/if.h>
@@ -10727,6 +10728,9 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #          ifdef HAVE_INTTYPES_H
            #include <inttypes.h>
+#          endif
+#          ifdef HAVE_SYS_BITYPES_H
+            #include <sys/bitypes.h>
 #          endif
            #include <stdio.h>
            #include <sys/types.h>
@@ -10806,6 +10810,9 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #          ifdef HAVE_INTTYPES_H
            #include <inttypes.h>
+#          endif
+#          ifdef HAVE_SYS_BITYPES_H
+            #include <sys/bitypes.h>
 #          endif
            #include <stdio.h>
            #include <sys/types.h>
@@ -10885,6 +10892,9 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #          ifdef HAVE_INTTYPES_H
            #include <inttypes.h>
+#          endif
+#          ifdef HAVE_SYS_BITYPES_H
+            #include <sys/bitypes.h>
 #          endif
            #include <stdio.h>
            #include <sys/types.h>
@@ -10964,6 +10974,9 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #          ifdef HAVE_INTTYPES_H
            #include <inttypes.h>
+#          endif
+#          ifdef HAVE_SYS_BITYPES_H
+            #include <sys/bitypes.h>
 #          endif
            #include <stdio.h>
            #include <sys/types.h>

diff --git a/configure.in b/configure.in
index c9243f8e87a569a6e0d2f4048a07362049f2ce88..4fc7626160df95ffb9d706e6356487b12493ff8b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.188.2.1 2005-04-20 09:46:44 guy Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.188.2.2 2005-04-20 09:51:04 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.188.2.1 $)
+AC_REVISION($Revision: 1.188.2.2 $)
 AC_PREREQ(2.50)
 AC_INIT(tcpdump.c)
 
@@ -628,6 +628,7 @@ if test "$ac_cv_func_ether_ntohost" = yes -a \
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 struct mbuf;
 struct rtentry;
 #include <net/if.h>