diff options
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | STATUS | 4 | ||||
| -rw-r--r-- | configure.in | 31 |
3 files changed, 27 insertions, 12 deletions
@@ -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,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: @@ -133,8 +133,6 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: -- 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 - reformat to APR style (think this is now done, but some tabs left) diff --git a/configure.in b/configure.in index e3fd8525f..541d8a652 100644 --- a/configure.in +++ b/configure.in @@ -1312,6 +1312,14 @@ AC_CHECK_FUNCS(set_h_errno) 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_WORKING_GETNAMEINFO 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 |