mirror of
https://github.com/nginx/nginx.git
synced 2024-11-21 16:28:40 +00:00
Configure: removed the --with-ipv6 option.
IPv6 now compiled-in automatically if support is found. If there is a need to disable it for some reason, --with-cc-opt="-DNGX_HAVE_INET6=0" can be used for this.
This commit is contained in:
parent
967ebbec32
commit
2c84f7af2c
@ -74,17 +74,15 @@ if [ $ngx_found = yes ]; then
|
||||
|
||||
NGX_LIB_GEOIP=$ngx_feature_libs
|
||||
|
||||
if [ $NGX_IPV6 = YES ]; then
|
||||
ngx_feature="GeoIP IPv6 support"
|
||||
ngx_feature_name="NGX_HAVE_GEOIP_V6"
|
||||
ngx_feature_run=no
|
||||
ngx_feature_incs="#include <stdio.h>
|
||||
#include <GeoIP.h>"
|
||||
#ngx_feature_path=
|
||||
#ngx_feature_libs=
|
||||
ngx_feature_test="printf(\"%d\", GEOIP_CITY_EDITION_REV0_V6);"
|
||||
. auto/feature
|
||||
fi
|
||||
ngx_feature="GeoIP IPv6 support"
|
||||
ngx_feature_name="NGX_HAVE_GEOIP_V6"
|
||||
ngx_feature_run=no
|
||||
ngx_feature_incs="#include <stdio.h>
|
||||
#include <GeoIP.h>"
|
||||
#ngx_feature_path=
|
||||
#ngx_feature_libs=
|
||||
ngx_feature_test="printf(\"%d\", GEOIP_CITY_EDITION_REV0_V6);"
|
||||
. auto/feature
|
||||
|
||||
else
|
||||
|
||||
|
@ -44,7 +44,6 @@ EVENT_POLL=NO
|
||||
USE_THREADS=NO
|
||||
|
||||
NGX_FILE_AIO=NO
|
||||
NGX_IPV6=NO
|
||||
|
||||
HTTP=YES
|
||||
|
||||
@ -204,7 +203,11 @@ do
|
||||
--with-threads) USE_THREADS=YES ;;
|
||||
|
||||
--with-file-aio) NGX_FILE_AIO=YES ;;
|
||||
--with-ipv6) NGX_IPV6=YES ;;
|
||||
|
||||
--with-ipv6)
|
||||
NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG
|
||||
$0: warning: the \"--with-ipv6\" option is deprecated"
|
||||
;;
|
||||
|
||||
--without-http) HTTP=NO ;;
|
||||
--without-http-cache) HTTP_CACHE=NO ;;
|
||||
@ -424,7 +427,6 @@ cat << END
|
||||
--with-threads enable thread pool support
|
||||
|
||||
--with-file-aio enable file AIO support
|
||||
--with-ipv6 enable IPv6 support
|
||||
|
||||
--with-http_ssl_module enable ngx_http_ssl_module
|
||||
--with-http_v2_module enable ngx_http_v2_module
|
||||
|
@ -37,8 +37,6 @@ if [ $EVENT_SELECT = NO ]; then
|
||||
EVENT_MODULES="$EVENT_MODULES $SELECT_MODULE"
|
||||
fi
|
||||
|
||||
if [ $NGX_IPV6 = YES ]; then
|
||||
have=NGX_HAVE_INET6 . auto/have
|
||||
fi
|
||||
have=NGX_HAVE_INET6 . auto/have
|
||||
|
||||
have=NGX_HAVE_IOCP . auto/have
|
||||
|
26
auto/unix
26
auto/unix
@ -637,20 +637,18 @@ ngx_param=NGX_MAX_TIME_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value
|
||||
# syscalls, libc calls and some features
|
||||
|
||||
|
||||
if [ $NGX_IPV6 = YES ]; then
|
||||
ngx_feature="AF_INET6"
|
||||
ngx_feature_name="NGX_HAVE_INET6"
|
||||
ngx_feature_run=no
|
||||
ngx_feature_incs="#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>"
|
||||
ngx_feature_path=
|
||||
ngx_feature_libs=
|
||||
ngx_feature_test="struct sockaddr_in6 sin6;
|
||||
sin6.sin6_family = AF_INET6;
|
||||
(void) sin6"
|
||||
. auto/feature
|
||||
fi
|
||||
ngx_feature="AF_INET6"
|
||||
ngx_feature_name="NGX_HAVE_INET6"
|
||||
ngx_feature_run=no
|
||||
ngx_feature_incs="#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>"
|
||||
ngx_feature_path=
|
||||
ngx_feature_libs=
|
||||
ngx_feature_test="struct sockaddr_in6 sin6;
|
||||
sin6.sin6_family = AF_INET6;
|
||||
(void) sin6"
|
||||
. auto/feature
|
||||
|
||||
|
||||
ngx_feature="setproctitle()"
|
||||
|
@ -84,8 +84,7 @@ win32:
|
||||
--with-openssl-opt=no-asm \
|
||||
--with-http_ssl_module \
|
||||
--with-mail_ssl_module \
|
||||
--with-stream_ssl_module \
|
||||
--with-ipv6
|
||||
--with-stream_ssl_module
|
||||
|
||||
|
||||
zip: export
|
||||
|
Loading…
Reference in New Issue
Block a user