diff options
| author | Jeff Trawick <trawick@apache.org> | 2011-04-12 17:26:25 +0200 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2011-04-12 17:26:25 +0200 |
| commit | 3f64cea3571c5ee5f98fd6ec9de1d667e85cc8ac (patch) | |
| tree | 03ad5b15f02a650ae43454e8ea831a38ac2d8928 /configure.in | |
| parent | add some debug logging to show more information about passing of sockets (diff) | |
| download | apache2-3f64cea3571c5ee5f98fd6ec9de1d667e85cc8ac.tar.xz apache2-3f64cea3571c5ee5f98fd6ec9de1d667e85cc8ac.zip | |
AP_ENABLE_V4_MAPPED with WinNT MPM
mpm_winnt.c: Fail to compile if enabled, and add a hint about the
issue to address before it will work.
configure.in: Move the --enable-v4-mapped check to below the
MPM logic, and default to --disable-v4-mapped if
using the WinNT MPM
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1091467 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/configure.in b/configure.in index 8afe224cbe..93d6029dc7 100644 --- a/configure.in +++ b/configure.in @@ -512,28 +512,6 @@ esac APACHE_SUBST(DTRACE) -APR_CHECK_APR_DEFINE(APR_HAVE_IPV6) - -AC_ARG_ENABLE(v4-mapped,APACHE_HELP_STRING(--enable-v4-mapped,Allow IPv6 sockets to handle IPv4 connections), -[ - v4mapped=$enableval -], -[ - case $host in - *freebsd5*|*netbsd*|*openbsd*) - v4mapped=no - ;; - *) - v4mapped=yes - ;; -esac -]) - -if test $v4mapped = "yes" -a $ac_cv_define_APR_HAVE_IPV6 = "yes"; then - AC_DEFINE(AP_ENABLE_V4_MAPPED, 1, - [Allow IPv4 connections on IPv6 listening sockets]) -fi - AC_ARG_ENABLE(exception-hook,APACHE_HELP_STRING(--enable-exception-hook,Enable fatal exception hook), [ AC_DEFINE(AP_ENABLE_EXCEPTION_HOOK, 1, @@ -714,6 +692,31 @@ if test "$AP_NONBLOCK_WHEN_MULTI_LISTEN" = "1"; then [Listening sockets are non-blocking when there are more than 1]) fi +APR_CHECK_APR_DEFINE(APR_HAVE_IPV6) + +AC_ARG_ENABLE(v4-mapped,APACHE_HELP_STRING(--enable-v4-mapped,Allow IPv6 sockets to handle IPv4 connections), +[ + v4mapped=$enableval +], +[ + case $host in + *freebsd5*|*netbsd*|*openbsd*) + v4mapped=no + ;; + *) + v4mapped=yes + ;; + esac + if ap_mpm_is_enabled winnt; then + dnl WinNT MPM doesn't support this. + v4mapped=no + fi +]) + +if test $v4mapped = "yes" -a $ac_cv_define_APR_HAVE_IPV6 = "yes"; then + AC_DEFINE(AP_ENABLE_V4_MAPPED, 1, + [Allow IPv4 connections on IPv6 listening sockets]) +fi APACHE_FAST_OUTPUT(Makefile modules/Makefile srclib/Makefile) APACHE_FAST_OUTPUT(os/Makefile server/Makefile) |