diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-11-27 11:12:34 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-11-27 11:12:34 +0000 |
| commit | 693c45251756e2ae3e1a823fae81515fc4294cee (patch) | |
| tree | 2a3fee1e73aa68164f00ce13dc0ccd551cedf47f | |
| parent | 0ec09f9196c46fca909a88dcb8507838b33f512d (diff) | |
| download | nginx-693c45251756e2ae3e1a823fae81515fc4294cee.tar.gz nginx-693c45251756e2ae3e1a823fae81515fc4294cee.tar.bz2 | |
fix the previous commit
Diffstat (limited to '')
| -rw-r--r-- | auto/lib/pcre/conf | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf index 6ad91641e..045e6c855 100644 --- a/auto/lib/pcre/conf +++ b/auto/lib/pcre/conf @@ -105,15 +105,18 @@ else else # Linux package - ngx_feature="PCRE library in /usr/include/pcre/" - ngx_feature_name="NGX_PCRE" - ngx_feature_run=no - ngx_feature_incs="#include <pcre.h>" - ngx_feature_path="/usr/include/pcre" - ngx_feature_libs="-lpcre" - ngx_feature_test="pcre *re; - re = pcre_compile(NULL, 0, NULL, 0, NULL)" - . auto/feature + if [ $PCRE = NO ]; then + + ngx_feature="PCRE library in /usr/include/pcre/" + ngx_feature_name="NGX_PCRE" + ngx_feature_run=no + ngx_feature_incs="#include <pcre.h>" + ngx_feature_path="/usr/include/pcre" + ngx_feature_libs="-lpcre" + ngx_feature_test="pcre *re; + re = pcre_compile(NULL, 0, NULL, 0, NULL)" + . auto/feature + fi fi if [ $ngx_found = yes ]; then @@ -127,15 +130,18 @@ else else # NetBSD port - ngx_feature="PCRE library in /usr/pkg/" - ngx_feature_name="NGX_PCRE" - ngx_feature_run=no - ngx_feature_incs="#include <pcre.h>" - ngx_feature_path="/usr/pkg/include" - ngx_feature_libs="-L /usr/pkg/lib -lpcre" - ngx_feature_test="pcre *re; - re = pcre_compile(NULL, 0, NULL, 0, NULL)" - . auto/feature + if [ $PCRE = NO ]; then + + ngx_feature="PCRE library in /usr/pkg/" + ngx_feature_name="NGX_PCRE" + ngx_feature_run=no + ngx_feature_incs="#include <pcre.h>" + ngx_feature_path="/usr/pkg/include" + ngx_feature_libs="-L /usr/pkg/lib -lpcre" + ngx_feature_test="pcre *re; + re = pcre_compile(NULL, 0, NULL, 0, NULL)" + . auto/feature + fi fi if [ $ngx_found = yes ]; then |