Mercurial > hg > nginx

changeset 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
files auto/lib/geoip/conf
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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"
@@ -64,6 +65,8 @@ fi
 
 
 if [ $ngx_found = yes ]; then
+
+    CORE_INCS="$CORE_INCS $ngx_feature_path"
     CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
 
 else