diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2013-02-11 15:34:30 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2013-02-11 15:34:30 +0000 |
| commit | 431111e8d814280b2208d5910f4618b228f5af7d (patch) | |
| tree | d7da6fcafe8220a2000732d078638469417cd4cc /auto | |
| parent | e8ef9ea62b0b393455bf6fcd588c8ccf5ff72e74 (diff) | |
| download | nginx-431111e8d814280b2208d5910f4618b228f5af7d.tar.gz nginx-431111e8d814280b2208d5910f4618b228f5af7d.tar.bz2 | |
Merge of r5014, r5015, r5016, r5030: geoip ipv6 support.
*) Configure: fixed style of include directories.
*) Configure: fixed GeoIP library detection.
*) GeoIP: IPv6 support. When using IPv6 databases, IPv4 addresses are
looked up as IPv4-mapped IPv6 addresses. Mostly based on a patch
by Gregor Kališnik (ticket #250).
*) GeoIP: removed pseudo-support of "proxy" and "netspeed" databases.
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/lib/geoip/conf | 19 | ||||
| -rw-r--r-- | auto/lib/libgd/conf | 2 |
2 files changed, 18 insertions, 3 deletions
diff --git a/auto/lib/geoip/conf b/auto/lib/geoip/conf index 3764d7649..53c274d54 100644 --- a/auto/lib/geoip/conf +++ b/auto/lib/geoip/conf @@ -6,7 +6,7 @@ ngx_feature="GeoIP library" ngx_feature_name= ngx_feature_run=no - ngx_feature_incs= + ngx_feature_incs="#include <GeoIP.h>" ngx_feature_path= ngx_feature_libs="-lGeoIP" ngx_feature_test="GeoIP_open(NULL, 0)" @@ -18,6 +18,7 @@ if [ $ngx_found = no ]; then # FreeBSD port ngx_feature="GeoIP library in /usr/local/" + ngx_feature_path="/usr/local/include" if [ $NGX_RPATH = YES ]; then ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lGeoIP" @@ -34,7 +35,7 @@ if [ $ngx_found = no ]; then # NetBSD port ngx_feature="GeoIP library in /usr/pkg/" - ngx_feature_path="/usr/pkg/include/" + ngx_feature_path="/usr/pkg/include" if [ $NGX_RPATH = YES ]; then ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lGeoIP" @@ -64,8 +65,22 @@ fi if [ $ngx_found = yes ]; then + + CORE_INCS="$CORE_INCS $ngx_feature_path" CORE_LIBS="$CORE_LIBS $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 + else cat << END diff --git a/auto/lib/libgd/conf b/auto/lib/libgd/conf index b0bc74c15..ff99054db 100644 --- a/auto/lib/libgd/conf +++ b/auto/lib/libgd/conf @@ -35,7 +35,7 @@ if [ $ngx_found = no ]; then # NetBSD port ngx_feature="GD library in /usr/pkg/" - ngx_feature_path="/usr/pkg/include/" + ngx_feature_path="/usr/pkg/include" if [ $NGX_RPATH = YES ]; then ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lgd" |