Mercurial > hg > nginx
comparison auto/lib/conf @ 3241:0ecc8d7c77b1 stable-0.7
merge r2986, r2992, r3032:
ngx_http_geoip_module
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 26 Oct 2009 16:38:44 +0000 |
| parents | cb3d4dc8c6db |
| children |
comparison
equal
deleted
inserted
replaced
| 3240:39f82eb3d0f2 | 3241:0ecc8d7c77b1 |
|---|---|
| 65 | 65 |
| 66 if [ $USE_PERL = YES ]; then | 66 if [ $USE_PERL = YES ]; then |
| 67 . auto/lib/perl/conf | 67 . auto/lib/perl/conf |
| 68 fi | 68 fi |
| 69 | 69 |
| 70 if [ $HTTP_GEOIP = YES ]; then | |
| 71 . auto/lib/geoip/conf | |
| 72 fi | |
| 70 if [ $NGX_GOOGLE_PERFTOOLS = YES ]; then | 73 if [ $NGX_GOOGLE_PERFTOOLS = YES ]; then |
| 71 . auto/lib/google-perftools/conf | 74 . auto/lib/google-perftools/conf |
| 72 fi | 75 fi |