[nginx] svn commit: r5015 - trunk/auto/lib/geoip

ru at nginx.com ru at nginx.com
Thu Jan 24 16:15:07 UTC 2013


Author: ru
Date: 2013-01-24 16:15:07 +0000 (Thu, 24 Jan 2013)
New Revision: 5015
URL: http://trac.nginx.org/nginx/changeset/5015/nginx

Log:
Configure: fixed GeoIP library detection.


Modified:
   trunk/auto/lib/geoip/conf

Modified: trunk/auto/lib/geoip/conf
===================================================================
--- trunk/auto/lib/geoip/conf	2013-01-24 16:14:12 UTC (rev 5014)
+++ trunk/auto/lib/geoip/conf	2013-01-24 16:15:07 UTC (rev 5015)
@@ -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 @@
     # 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 @@
 
 
 if [ $ngx_found = yes ]; then
+
+    CORE_INCS="$CORE_INCS $ngx_feature_path"
     CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
 
 else



More information about the nginx-devel mailing list