diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2016-10-04 16:38:14 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2016-10-04 16:38:14 +0300 |
| commit | 2c84f7af2c97a55bf138a5fcedeb164733dc9bea (patch) | |
| tree | c50b44dcc2152f0f90cdeeb754a8c7270ba904a5 /auto/lib | |
| parent | 967ebbec321b1daa6632ab843b2dd2346a9fa8d0 (diff) | |
| download | nginx-2c84f7af2c97a55bf138a5fcedeb164733dc9bea.tar.gz nginx-2c84f7af2c97a55bf138a5fcedeb164733dc9bea.zip | |
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.
Diffstat (limited to 'auto/lib')
| -rw-r--r-- | auto/lib/geoip/conf | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/auto/lib/geoip/conf b/auto/lib/geoip/conf index ebd2e15cc..8302aae17 100644 --- a/auto/lib/geoip/conf +++ b/auto/lib/geoip/conf @@ -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 |