Mercurial > hg > nginx

comparison auto/lib/geoip/conf @ 5014:210b66a6fc7f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Configure: fixed GeoIP library detection.
author Ruslan Ermilov <ru@nginx.com>
date Thu, 24 Jan 2013 16:15:07 +0000
parents 82a3f951feb3
children a74d211f034d
comparison
equal deleted inserted replaced
5013:82a3f951feb3 5014:210b66a6fc7f
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"
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"
68 71
69 else 72 else
70 73
71 cat << END 74 cat << END