Mercurial > hg > nginx

comparison auto/lib/geoip/conf @ 5061:7ce4ecb6df5c stable-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 11 Feb 2013 15:34:30 +0000
parents d620f497c50f
children
comparison
equal deleted inserted replaced
5060:8fff74441755 5061:7ce4ecb6df5c
4 4
5 5
6 ngx_feature="GeoIP library" 6 ngx_feature="GeoIP library"
7 ngx_feature_name= 7 ngx_feature_name=
8 ngx_feature_run=no 8 ngx_feature_run=no
9 ngx_feature_incs= 9 ngx_feature_incs="#include <GeoIP.h>"
10 ngx_feature_path= 10 ngx_feature_path=
11 ngx_feature_libs="-lGeoIP" 11 ngx_feature_libs="-lGeoIP"
12 ngx_feature_test="GeoIP_open(NULL, 0)" 12 ngx_feature_test="GeoIP_open(NULL, 0)"
13 . auto/feature 13 . auto/feature
14 14
16 if [ $ngx_found = no ]; then 16 if [ $ngx_found = no ]; then
17 17
18 # FreeBSD port 18 # FreeBSD port
19 19
20 ngx_feature="GeoIP library in /usr/local/" 20 ngx_feature="GeoIP library in /usr/local/"
21 ngx_feature_path="/usr/local/include"
21 22
22 if [ $NGX_RPATH = YES ]; then 23 if [ $NGX_RPATH = YES ]; then
23 ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lGeoIP" 24 ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lGeoIP"
24 else 25 else
25 ngx_feature_libs="-L/usr/local/lib -lGeoIP" 26 ngx_feature_libs="-L/usr/local/lib -lGeoIP"
32 if [ $ngx_found = no ]; then 33 if [ $ngx_found = no ]; then
33 34
34 # NetBSD port 35 # NetBSD port
35 36
36 ngx_feature="GeoIP library in /usr/pkg/" 37 ngx_feature="GeoIP library in /usr/pkg/"
37 ngx_feature_path="/usr/pkg/include/" 38 ngx_feature_path="/usr/pkg/include"
38 39
39 if [ $NGX_RPATH = YES ]; then 40 if [ $NGX_RPATH = YES ]; then
40 ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lGeoIP" 41 ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lGeoIP"
41 else 42 else
42 ngx_feature_libs="-L/usr/pkg/lib -lGeoIP" 43 ngx_feature_libs="-L/usr/pkg/lib -lGeoIP"
62 . auto/feature 63 . auto/feature
63 fi 64 fi
64 65
65 66
66 if [ $ngx_found = yes ]; then 67 if [ $ngx_found = yes ]; then
68
69 CORE_INCS="$CORE_INCS $ngx_feature_path"
67 CORE_LIBS="$CORE_LIBS $ngx_feature_libs" 70 CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
71
72 if [ $NGX_IPV6 = YES ]; then
73 ngx_feature="GeoIP IPv6 support"
74 ngx_feature_name="NGX_HAVE_GEOIP_V6"
75 ngx_feature_run=no
76 ngx_feature_incs="#include <stdio.h>
77 #include <GeoIP.h>"
78 #ngx_feature_path=
79 #ngx_feature_libs=
80 ngx_feature_test="printf(\"%d\", GEOIP_CITY_EDITION_REV0_V6);"
81 . auto/feature
82 fi
68 83
69 else 84 else
70 85
71 cat << END 86 cat << END
72 87