feature: added new configure option --with-pcre-conf-opt=OPTIONS to the nginx core to allow custom PCRE ./configure build options. thanks Lance Li for the original patch in #39.

This commit is contained in:
Yichun Zhang (agentzh)
2013-12-10 10:18:15 -08:00
parent 378f94fb58
commit 0528788543
5 changed files with 37 additions and 4 deletions

3
util/configure vendored
View File

@ -1025,7 +1025,8 @@ Options directly inherited from nginx
--without-pcre disable PCRE library usage
--with-pcre force PCRE library usage
--with-pcre=DIR set path to PCRE library sources
--with-pcre-opt=OPTIONS set additional options for PCRE building
--with-pcre-opt=OPTIONS set additional make options for PCRE
--with-pcre-conf-opt=OPTIONS set additional configure options for PCRE
--with-pcre-jit build PCRE with JIT compilation support
--with-md5=DIR set path to md5 library sources

View File

@ -214,6 +214,10 @@ echo "$info_txt applying the larger_max_error_str patch for nginx $ver"
patch -p1 < $root/patches/nginx-$ver-larger_max_error_str.patch || exit 1
echo
echo "$info_txt applying the pcre_conf_opt patch for nginx $ver"
patch -p1 < $root/patches/nginx-$ver-pcre_conf_opt.patch || exit 1
echo
rm -f *.patch || exit 1
cd .. || exit 1

View File

@ -2,7 +2,7 @@
#main_ver=1.5.4
main_ver=1.4.3
minor_ver=6
minor_ver=7rc1
version=$main_ver.$minor_ver
echo $version