apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: apr STATUS CHANGES configure.in
Date Fri, 17 Aug 2001 13:35:34 GMT
trawick     01/08/17 06:35:34

  Modified:    .        STATUS CHANGES configure.in
  Log:
  Introduce a new --disable-ipv6 option to disable IPv6 support.
  Submitted by:            Sterling Hughes <sterling@designmultimedia.com>
  Reviewed and mangled by: Jeff Trawick
  
  Revision  Changes    Path
  1.57      +1 -3      apr/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/apr/STATUS,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- STATUS	2001/08/07 19:57:44	1.56
  +++ STATUS	2001/08/17 13:35:34	1.57
  @@ -1,5 +1,5 @@
   APACHE PORTABLE RUNTIME (APR) LIBRARY STATUS:			-*-text-*-
  -Last modified at [$Date: 2001/08/07 19:57:44 $]
  +Last modified at [$Date: 2001/08/17 13:35:34 $]
   
   Release:
   
  @@ -132,8 +132,6 @@
         pass to apr_dso_load()
         -- note on Win32 we distinguish 'apache module' names from other 
            'loadable module' names, so be careful with Apache's directive.
  -
  -    * may be good to have a --disable-ipv6 configure option
   
       * APR memory code - code has been added but we still need to
         - decide on a better name for the code
  
  
  
  1.140     +4 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.139
  retrieving revision 1.140
  diff -u -r1.139 -r1.140
  --- CHANGES	2001/08/14 05:17:58	1.139
  +++ CHANGES	2001/08/17 13:35:34	1.140
  @@ -1,5 +1,9 @@
   Changes with APR b1  
   
  +  *) Introduce a new --disable-ipv6 option to disable IPv6 support.
  +     [Sterling Hughes <sterling@designmultimedia.com>, Jeff
  +     Trawick]
  +
     *) Fix the new shared memory code.  We need to pass a pointer to
        an apr_file_t to apr_file_open.  Also, apr_os_file_get returns
        a status value, not the OS file descriptor.  [Ryan Bloom]
  
  
  
  1.361     +22 -9     apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.360
  retrieving revision 1.361
  diff -u -r1.360 -r1.361
  --- configure.in	2001/08/16 06:49:46	1.360
  +++ configure.in	2001/08/17 13:35:34	1.361
  @@ -1312,6 +1312,14 @@
   
   echo $ac_n "${nl}Checking for IPv6 Networking support...${nl}"
   dnl # Start of checking for IPv6 support...
  +
  +AC_ARG_ENABLE(ipv6,
  +  [  --disable-ipv6          Disable IPv6 support in APR.],
  +  [ if test "$enableval" = "no"; then
  +        user_disabled_ipv6=1
  +    fi ],
  +  [ user_disabled_ipv6=0 ] )
  +
   AC_SEARCH_LIBS(getaddrinfo, inet6)
   AC_SEARCH_LIBS(getnameinfo, inet6)
   APR_CHECK_WORKING_GETADDRINFO
  @@ -1319,20 +1327,25 @@
   APR_CHECK_SOCKADDR_IN6
   AC_MSG_CHECKING(if APR supports IPv6)
   have_ipv6="0"
  -if test "x$have_sockaddr_in6" = "x1"; then
  -    if test "x$ac_cv_working_getaddrinfo" = "xyes"; then
  -        if test "x$ac_cv_working_getnameinfo" = "xyes"; then
  -            have_ipv6="1"
  -            AC_MSG_RESULT("yes")
  +if test "$user_disabled_ipv6" = 1; then
  +    AC_MSG_RESULT("no -- disabled by user")
  +else
  +    if test "x$have_sockaddr_in6" = "x1"; then
  +        if test "x$ac_cv_working_getaddrinfo" = "xyes"; then
  +            if test "x$ac_cv_working_getnameinfo" = "xyes"; then
  +                have_ipv6="1"
  +                AC_MSG_RESULT("yes")
  +            else
  +                AC_MSG_RESULT("no -- no getnameinfo")
  +            fi
           else
  -            AC_MSG_RESULT("no -- no getnameinfo")
  +            AC_MSG_RESULT("no -- no working getaddrinfo")
           fi
       else
  -        AC_MSG_RESULT("no -- no working getaddrinfo")
  +        AC_MSG_RESULT("no -- no sockaddr_in6");
       fi
  -else
  -    AC_MSG_RESULT("no -- no sockaddr_in6");
   fi
  +
   AC_SUBST(have_ipv6)
   
   dnl #----------------------------- Finalize the variables
  
  
  

Mime
View raw message