From cvs-return-840-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org Mon Mar 05 20:28:47 2001
Return-Path: <cvs-return-840-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org>
Delivered-To: apmail-apr-cvs-archive@apr.apache.org
Received: (qmail 24997 invoked by uid 500); 5 Mar 2001 20:28:44 -0000
Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:cvs@apr.apache.org>
List-Help: <mailto:cvs-help@apr.apache.org>
List-Unsubscribe: <mailto:cvs-unsubscribe@apr.apache.org>
List-Subscribe: <mailto:cvs-subscribe@apr.apache.org>
Reply-To: dev@apr.apache.org
Delivered-To: mailing list cvs@apr.apache.org
Received: (qmail 24983 invoked by uid 1121); 5 Mar 2001 20:28:43 -0000
Date: 5 Mar 2001 20:28:43 -0000
Message-ID: <20010305202843.24982.qmail@apache.org>
From: trawick@apache.org
To: apr-cvs@apache.org
Subject: cvs commit: apr configure.in CHANGES

trawick     01/03/05 12:28:42

  Modified:    network_io/unix inet_aton.c
               .        configure.in CHANGES
  Log:
  Change the check for netinet/tcp.h to work around an issue with
  that header file on IRIX 6.5 which prevented it from being
  detected.
  
  PR:			6459
  
  Revision  Changes    Path
  1.2       +1 -1      apr/network_io/unix/inet_aton.c
  
  Index: inet_aton.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/unix/inet_aton.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- inet_aton.c	2000/05/16 20:35:38	1.1
  +++ inet_aton.c	2001/03/05 20:28:41	1.2
  @@ -69,7 +69,7 @@
    */
   
   #include "apr_private.h"
  -#ifndef HAVE_NETINET_TCP_H
  +#if !APR_HAVE_NETINET_TCP_H
   
   #include "networkio.h"
   
  
  
  
  1.255     +16 -1     apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.254
  retrieving revision 1.255
  diff -u -r1.254 -r1.255
  --- configure.in	2001/03/01 13:41:43	1.254
  +++ configure.in	2001/03/05 20:28:42	1.255
  @@ -450,7 +450,6 @@
       kernel/OS.h		\
       net/errno.h		\
       netinet/in.h	\
  -    netinet/tcp.h	\
       sys/file.h		\
       sys/mman.h		\
       sys/poll.h		\
  @@ -466,6 +465,22 @@
       sys/types.h		\
       sys/uio.h		\
       sys/wait.h)
  +
  +dnl IRIX 6.5 has a problem in <netinet/tcp.h> which prevents it from
  +dnl being included by itself.  Check for <netinet/tcp.h> manually,
  +dnl including another header file first.
  +AC_MSG_CHECKING(for netinet/tcp.h)
  +AC_TRY_CPP([
  +#ifdef HAVE_NETINET_IN_H
  +#include <netinet/in.h>
  +#endif
  +#include <netinet/tcp.h>
  +], netinet_tcph="1", netinet_tcph="0")
  +if test $netinet_tcph = 1; then
  +  AC_MSG_RESULT(yes)
  +else
  +  AC_MSG_RESULT(no)
  +fi
   
   AC_SUBST(arpa_ineth)
   AC_SUBST(conioh)
  
  
  
  1.69      +4 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- CHANGES	2001/02/22 04:16:54	1.68
  +++ CHANGES	2001/03/05 20:28:42	1.69
  @@ -1,5 +1,9 @@
   Changes with APR b1  
   
  +  *) Change the check for netinet/tcp.h to work around an issue with
  +     that header file on IRIX 6.5 which prevented it from being
  +     detected.  PR #6459  [Jeff Trawick]
  +
     *) Introduce apr_get_userid to return a named user's apr_uid_t and
        apr_gid_t across platforms [Cliff Woolley, William Rowe]