Mercurial > hg > nginx-ranges

comparison auto/lib/pcre/conf @ 336:1c519aff5c0c NGINX_0_6_12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.6.12 *) Change: mail proxy was split on three modules: pop3, imap and smtp. *) Feature: the --without-mail_pop3_module, --without-mail_imap_module, and --without-mail_smtp_module configuration parameters. *) Feature: the "smtp_greeting_delay" and "smtp_client_buffer" directives of the ngx_mail_smtp_module. *) Bugfix: the trailing wildcards did not work; bug appeared in 0.6.9. *) Bugfix: nginx could not start on Solaris if the shared PCRE library located in non-standard place was used. *) Bugfix: the "proxy_hide_header" and "fastcgi_hide_header" directives did not hide response header lines whose name was longer than 32 characters. Thanks to Manlio Perillo.
author Igor Sysoev <http://sysoev.ru>
date Fri, 21 Sep 2007 00:00:00 +0400
parents d16d691432c9
children edf1cb6c328e
comparison
equal deleted inserted replaced
335:9a32ae248b7a 336:1c519aff5c0c
75 *) 75 *)
76 have=NGX_PCRE . auto/have 76 have=NGX_PCRE . auto/have
77 CORE_DEPS="$CORE_DEPS $PCRE/pcre.h" 77 CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
78 LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a" 78 LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a"
79 CORE_LIBS="$CORE_LIBS $PCRE/.libs/libpcre.a" 79 CORE_LIBS="$CORE_LIBS $PCRE/.libs/libpcre.a"
80 #CORE_LIBS="$CORE_LIBS -L $PCRE/.libs -lpcre"
81 ;; 80 ;;
82 81
83 esac 82 esac
84 83
85 else 84 else
109 ngx_feature="PCRE library in /usr/local/" 108 ngx_feature="PCRE library in /usr/local/"
110 ngx_feature_name="NGX_PCRE" 109 ngx_feature_name="NGX_PCRE"
111 ngx_feature_run=no 110 ngx_feature_run=no
112 ngx_feature_incs="#include <pcre.h>" 111 ngx_feature_incs="#include <pcre.h>"
113 ngx_feature_path="/usr/local/include" 112 ngx_feature_path="/usr/local/include"
114 ngx_feature_libs="-L /usr/local/lib -lpcre" 113
114 if [ $NGX_RPATH = YES ]; then
115 ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lpcre"
116 else
117 ngx_feature_libs="-L/usr/local/lib -lpcre"
118 fi
119
115 ngx_feature_test="pcre *re; 120 ngx_feature_test="pcre *re;
116 re = pcre_compile(NULL, 0, NULL, 0, NULL)" 121 re = pcre_compile(NULL, 0, NULL, 0, NULL)"
117 . auto/feature 122 . auto/feature
118 fi 123 fi
119 124
158 ngx_feature="PCRE library in /usr/pkg/" 163 ngx_feature="PCRE library in /usr/pkg/"
159 ngx_feature_name="NGX_PCRE" 164 ngx_feature_name="NGX_PCRE"
160 ngx_feature_run=no 165 ngx_feature_run=no
161 ngx_feature_incs="#include <pcre.h>" 166 ngx_feature_incs="#include <pcre.h>"
162 ngx_feature_path="/usr/pkg/include" 167 ngx_feature_path="/usr/pkg/include"
163 ngx_feature_libs="-L /usr/pkg/lib -lpcre" 168
169 if [ $NGX_RPATH = YES ]; then
170 ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lpcre"
171 else
172 ngx_feature_libs="-L/usr/pkg/lib -lpcre"
173 fi
174
164 ngx_feature_test="pcre *re; 175 ngx_feature_test="pcre *re;
165 re = pcre_compile(NULL, 0, NULL, 0, NULL)" 176 re = pcre_compile(NULL, 0, NULL, 0, NULL)"
166 . auto/feature 177 . auto/feature
167 fi 178 fi
168 fi 179 fi
183 ngx_feature="PCRE library in /opt/local/" 194 ngx_feature="PCRE library in /opt/local/"
184 ngx_feature_name="NGX_PCRE" 195 ngx_feature_name="NGX_PCRE"
185 ngx_feature_run=no 196 ngx_feature_run=no
186 ngx_feature_incs="#include <pcre.h>" 197 ngx_feature_incs="#include <pcre.h>"
187 ngx_feature_path="/opt/local/include" 198 ngx_feature_path="/opt/local/include"
188 ngx_feature_libs="-L/opt/local/lib -lpcre" 199
200 if [ $NGX_RPATH = YES ]; then
201 ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lpcre"
202 else
203 ngx_feature_libs="-L/opt/local/lib -lpcre"
204 fi
205
189 ngx_feature_test="pcre *re; 206 ngx_feature_test="pcre *re;
190 re = pcre_compile(NULL, 0, NULL, 0, NULL)" 207 re = pcre_compile(NULL, 0, NULL, 0, NULL)"
191 . auto/feature 208 . auto/feature
192 fi 209 fi
193 fi 210 fi