Mercurial > hg > nginx-vendor-0-6

diff auto/lib/pcre/conf @ 376:d13234035cad NGINX_0_6_32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.6.32 *) Change: the "none" parameter in the "ssl_session_cache" directive; now this is default parameter. Thanks to Rob Mueller. *) Change: now the 0x00-0x1F, '"' and '\' characters are escaped as \xXX in an access_log. Thanks to Maxim Dounin. *) Change: now nginx allows several "Host" request header line. *) Feature: the "modified" flag in the "expires" directive. *) Feature: the $uid_got and $uid_set variables may be used at any request processing stage. *) Feature: the $hostname variable. Thanks to Andrei Nigmatulin. *) Feature: DESTDIR support. Thanks to Todd A. Fisher and Andras Voroskoi. *) Bugfix: if sub_filter and SSI were used together, then responses might were transferred incorrectly. *) Bugfix: large SSI inclusions might be truncated. *) Bugfix: the "proxy_pass" directive did not work with the HTTPS protocol; the bug had appeared in 0.6.9. *) Bugfix: worker processes might not catch reconfiguration and log rotation signals. *) Bugfix: nginx could not be built on latest Fedora 9 Linux. Thanks to Roxis. *) Bugfix: a segmentation fault might occur in worker process on Linux, if keepalive was enabled.
author Igor Sysoev <http://sysoev.ru>
date Mon, 07 Jul 2008 00:00:00 +0400
parents 1c519aff5c0c
children
line wrap: on
line diff
--- a/auto/lib/pcre/conf
+++ b/auto/lib/pcre/conf
@@ -84,6 +84,7 @@ if [ $PCRE != NONE ]; then
 else
 
     if [ "$NGX_PLATFORM" != win32 ]; then
+
         PCRE=NO
 
         ngx_feature="PCRE library"
@@ -95,20 +96,11 @@ else
         ngx_feature_test="pcre *re; re = pcre_compile(NULL, 0, NULL, 0, NULL)"
         . auto/feature
 
-        if [ $ngx_found = yes ]; then
-            CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
-            CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
-            CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
-            PCRE=YES
-            ngx_found=no
+        if [ $ngx_found = no ]; then
 
-        else
             # FreeBSD port
 
             ngx_feature="PCRE library in /usr/local/"
-            ngx_feature_name="NGX_PCRE"
-            ngx_feature_run=no
-            ngx_feature_incs="#include <pcre.h>"
             ngx_feature_path="/usr/local/include"
 
             if [ $NGX_RPATH = YES ]; then
@@ -117,8 +109,49 @@ else
                 ngx_feature_libs="-L/usr/local/lib -lpcre"
             fi
 
-            ngx_feature_test="pcre *re;
-                              re = pcre_compile(NULL, 0, NULL, 0, NULL)"
+            . auto/feature
+        fi
+
+        if [ $ngx_found = no ]; then
+
+            # Linux package
+
+            ngx_feature="PCRE library in /usr/include/pcre/"
+            ngx_feature_path="/usr/include/pcre"
+            ngx_feature_libs="-lpcre"
+
+            . auto/feature
+        fi
+
+        if [ $ngx_found = no ]; then
+
+            # NetBSD port
+
+            ngx_feature="PCRE library in /usr/pkg/"
+            ngx_feature_path="/usr/pkg/include"
+
+            if [ $NGX_RPATH = YES ]; then
+                ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lpcre"
+            else
+                ngx_feature_libs="-L/usr/pkg/lib -lpcre"
+            fi
+
+            . auto/feature
+        fi
+
+        if [ $ngx_found = no ]; then
+
+            # MacPorts
+
+            ngx_feature="PCRE library in /opt/local/"
+            ngx_feature_path="/opt/local/include"
+
+            if [ $NGX_RPATH = YES ]; then
+                ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lpcre"
+            else
+                ngx_feature_libs="-L/opt/local/lib -lpcre"
+            fi
+
             . auto/feature
         fi
 
@@ -128,94 +161,6 @@ else
             CORE_INCS="$CORE_INCS $ngx_feature_path"
             CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
             PCRE=YES
-            ngx_found=no
-
-        else
-            # Linux package
-
-            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
-            CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
-            CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
-            CORE_INCS="$CORE_INCS $ngx_feature_path"
-            CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
-            PCRE=YES
-            ngx_found=no
-
-        else
-            # NetBSD port
-
-            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"
-
-                if [ $NGX_RPATH = YES ]; then
-                    ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lpcre"
-                else
-                    ngx_feature_libs="-L/usr/pkg/lib -lpcre"
-                fi
-
-                ngx_feature_test="pcre *re;
-                                  re = pcre_compile(NULL, 0, NULL, 0, NULL)"
-                . auto/feature
-            fi
-        fi
-
-        if [ $ngx_found = yes ]; then
-            CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
-            CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
-            CORE_INCS="$CORE_INCS $ngx_feature_path"
-            CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
-            PCRE=YES
-            ngx_found=no
-
-        else
-            # MacPorts
-
-            if [ $PCRE = NO ]; then
-
-                ngx_feature="PCRE library in /opt/local/"
-                ngx_feature_name="NGX_PCRE"
-                ngx_feature_run=no
-                ngx_feature_incs="#include <pcre.h>"
-                ngx_feature_path="/opt/local/include"
-
-                if [ $NGX_RPATH = YES ]; then
-                    ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lpcre"
-                else
-                    ngx_feature_libs="-L/opt/local/lib -lpcre"
-                fi
-
-                ngx_feature_test="pcre *re;
-                                  re = pcre_compile(NULL, 0, NULL, 0, NULL)"
-                . auto/feature
-            fi
-        fi
-
-        if [ $ngx_found = yes ]; then
-            CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
-            CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
-            CORE_INCS="$CORE_INCS $ngx_feature_path"
-            CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
-            PCRE=YES
-            ngx_found=no
         fi
 
     fi