httpd-docs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/include apr.h.in
Date Sun, 17 Sep 2000 21:42:11 GMT
dreid       00/09/17 14:42:11

  Modified:    src/lib/apr aclocal.m4 configure.in
               src/lib/apr/include apr.h.in
  Log:
  This changes the way we check for inet_addr and inet_network.  The new tests
  allow BeOS BONE to work and shouldn't create any problems on other
  platforms.  Also a little bit of a consistency improvements with the variable
  names we use.
  
  Revision  Changes    Path
  1.25      +50 -0     apache-2.0/src/lib/apr/aclocal.m4
  
  Index: aclocal.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aclocal.m4,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- aclocal.m4	2000/06/30 01:56:48	1.24
  +++ aclocal.m4	2000/09/17 21:42:09	1.25
  @@ -273,5 +273,55 @@
   fi
   ])
   
  +AC_DEFUN(APR_CHECK_INET_ADDR,[
  +AC_CACHE_CHECK(for inet_addr, ac_cv_func_inet_addr,[
  +AC_TRY_COMPILE([
  +#ifdef HAVE_SYS_TYPES_H
  +#include <sys/types.h>
  +#endif
  +#ifdef HAVE_ARPA_INET_H
  +#include <arpa/inet.h>
  +#endif
  +],[
  +inet_addr("127.0.0.1");
  +],[
  +    ac_cv_func_inet_addr=yes
  +],[
  +    ac_cv_func_inet_addr=no
  +])
  +])
  +
  +if test "$ac_cv_func_inet_addr" = "yes"; then
  +  have_inet_addr=1
  +else
  +  have_inet_addr=0
  +fi
  +])
  +
  +AC_DEFUN(APR_CHECK_INET_NETWORK,[
  +AC_CACHE_CHECK(for inet_network, ac_cv_func_inet_network,[
  +AC_TRY_COMPILE([
  +#ifdef HAVE_SYS_TYPES_H
  +#include <sys/types.h>
  +#endif
  +#ifdef HAVE_ARPA_INET_H
  +#include <arpa/inet.h>
  +#endif
  +],[
  +inet_network("127.0.0.1");
  +],[
  +    ac_cv_func_inet_network=yes
  +],[
  +    ac_cv_func_inet_network=no
  +])
  +])
  +
  +if test "$ac_cv_func_inet_network" = "yes"; then
  +  have_inet_network=1
  +else
  +  have_inet_network=0
  +fi
  +])
  +
   sinclude(apr_common.m4)
   sinclude(hints.m4)
  
  
  
  1.149     +4 -4      apache-2.0/src/lib/apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
  retrieving revision 1.148
  retrieving revision 1.149
  diff -u -r1.148 -r1.149
  --- configure.in	2000/09/15 16:28:17	1.148
  +++ configure.in	2000/09/17 21:42:09	1.149
  @@ -222,8 +222,8 @@
   AC_CHECK_FUNCS(sendfile send_file, [ sendfile="1" ])
   AC_CHECK_FUNCS(fork, [ fork="1" ], [ fork="0" ])
   AC_CHECK_FUNCS(getpass)
  -AC_CHECK_FUNC(inet_addr, [ inet_addr="1" ], [ inet_addr="0" ])
  -AC_CHECK_FUNC(inet_network, [ inet_network="1" ], [ inet_network="0" ])
  +APR_CHECK_INET_ADDR
  +APR_CHECK_INET_NETWORK
   AC_CHECK_FUNC(_getch)
   AC_CHECK_FUNCS(gmtime_r localtime_r)
   AC_CHECK_FUNCS(iconv, [ iconv="1" ], [ iconv="0" ])
  @@ -237,8 +237,8 @@
   
   AC_SUBST(sendfile)
   AC_SUBST(fork)
  -AC_SUBST(inet_addr)
  -AC_SUBST(inet_network)
  +AC_SUBST(have_inet_addr)
  +AC_SUBST(have_inet_network)
   AC_SUBST(have_sigaction)
   AC_SUBST(have_setrlimit)
   AC_SUBST(have_getrlimit)
  
  
  
  1.41      +2 -2      apache-2.0/src/lib/apr/include/apr.h.in
  
  Index: apr.h.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.h.in,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- apr.h.in	2000/08/23 23:28:47	1.40
  +++ apr.h.in	2000/09/17 21:42:10	1.41
  @@ -59,8 +59,8 @@
   #define APR_MEM_BASED_SHM       @mem_based@
   
   #define APR_HAVE_IN_ADDR        @have_in_addr@
  -#define APR_HAVE_INET_ADDR      @inet_addr@
  -#define APR_HAVE_INET_NETWORK   @inet_network@
  +#define APR_HAVE_INET_ADDR      @have_inet_addr@
  +#define APR_HAVE_INET_NETWORK   @have_inet_network@
   #define APR_HAVE_UNION_SEMUN    @have_union_semun@
   #define APR_HAVE_STRUCT_RLIMIT  @struct_rlimit@
   #define APR_HAVE_SETRLIMIT      @have_setrlimit@
  
  
  

Mime
View raw message