summaryrefslogtreecommitdiffhomepage
path: root/auto/options
diff options
context:
space:
mode:
authorSergey Kandaurov <pluknet@nginx.com>2021-12-29 15:17:26 +0300
committerSergey Kandaurov <pluknet@nginx.com>2021-12-29 15:17:26 +0300
commitf3363a8dbe29b3159881e259b2690c78757c946f (patch)
treedfc3e7dd6803c65a8b2a94c941fe258d05f6c756 /auto/options
parentfa21bf0cc7ba2d94f66a061d644163547d79e6a2 (diff)
parent054944feb352ce16c5ef99e3fb58b8fd5796c0f1 (diff)
downloadnginx-f3363a8dbe29b3159881e259b2690c78757c946f.tar.gz
nginx-f3363a8dbe29b3159881e259b2690c78757c946f.tar.bz2
Merged with the default branch.
Diffstat (limited to 'auto/options')
-rw-r--r--auto/options3
1 files changed, 3 insertions, 0 deletions
diff --git a/auto/options b/auto/options
index d9873f462..ced563806 100644
--- a/auto/options
+++ b/auto/options
@@ -150,6 +150,7 @@ PCRE=NONE
PCRE_OPT=
PCRE_CONF_OPT=
PCRE_JIT=NO
+PCRE2=YES
USE_OPENSSL=NO
USE_OPENSSL_QUIC=NO
@@ -368,6 +369,7 @@ use the \"--with-mail_ssl_module\" option instead"
--with-pcre=*) PCRE="$value" ;;
--with-pcre-opt=*) PCRE_OPT="$value" ;;
--with-pcre-jit) PCRE_JIT=YES ;;
+ --without-pcre2) PCRE2=DISABLED ;;
--with-openssl=*) OPENSSL="$value" ;;
--with-openssl-opt=*) OPENSSL_OPT="$value" ;;
@@ -588,6 +590,7 @@ cat << END
--with-pcre=DIR set path to PCRE library sources
--with-pcre-opt=OPTIONS set additional build options for PCRE
--with-pcre-jit build PCRE with JIT compilation support
+ --without-pcre2 do not use PCRE2 library
--with-zlib=DIR set path to zlib library sources
--with-zlib-opt=OPTIONS set additional build options for zlib