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.
This commit is contained in:
guy 2005-04-20 09:49:52 +00:00
parent e1db53eeb7
commit caf503e482
3 changed files with 21 additions and 4 deletions

5
aclocal.m4 vendored
View File

@ -1,4 +1,4 @@
dnl @(#) $Header: /tcpdump/master/tcpdump/aclocal.m4,v 1.107 2005-04-20 09:44:30 guy Exp $ (LBL) dnl @(#) $Header: /tcpdump/master/tcpdump/aclocal.m4,v 1.108 2005-04-20 09:49:52 guy Exp $ (LBL)
dnl dnl
dnl Copyright (c) 1995, 1996, 1997, 1998 dnl Copyright (c) 1995, 1996, 1997, 1998
dnl The Regents of the University of California. All rights reserved. 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 # ifdef HAVE_INTTYPES_H
#include <inttypes.h> #include <inttypes.h>
# endif
# ifdef HAVE_SYS_BITYPES_H
#include <sys/bitypes.h>
# endif # endif
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>

15
configure vendored
View File

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

View File

@ -1,4 +1,4 @@
dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.189 2005-04-20 09:44:31 guy Exp $ (LBL) dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.190 2005-04-20 09:49:53 guy Exp $ (LBL)
dnl dnl
dnl Copyright (c) 1994, 1995, 1996, 1997 dnl Copyright (c) 1994, 1995, 1996, 1997
dnl The Regents of the University of California. All rights reserved. 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 Process this file with autoconf to produce a configure script.
dnl dnl
AC_REVISION($Revision: 1.189 $) AC_REVISION($Revision: 1.190 $)
AC_PREREQ(2.50) AC_PREREQ(2.50)
AC_INIT(tcpdump.c) AC_INIT(tcpdump.c)
@ -628,6 +628,7 @@ if test "$ac_cv_func_ether_ntohost" = yes -a \
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h>
struct mbuf; struct mbuf;
struct rtentry; struct rtentry;
#include <net/if.h> #include <net/if.h>