Mercurial > hg > nginx
comparison auto/options @ 6603:9eefb38f0005
Internal md5 and sha1 implementations are now always used.
This reduces the number of moving parts in ABI compatibility checks.
Additionally, it also allows to use OpenSSL in FIPS mode while still
using md5 for non-security tasks.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Thu, 30 Jun 2016 18:57:39 +0300 |
parents | 8f038068f4bc |
children | 73543af69f14 |
comparison
equal
deleted
inserted
replaced
6602:bcd442b585f0 | 6603:9eefb38f0005 |
---|---|
134 PCRE_JIT=NO | 134 PCRE_JIT=NO |
135 | 135 |
136 USE_OPENSSL=NO | 136 USE_OPENSSL=NO |
137 OPENSSL=NONE | 137 OPENSSL=NONE |
138 | 138 |
139 USE_MD5=NO | |
140 MD5=NONE | |
141 MD5_OPT= | |
142 MD5_ASM=NO | |
143 | |
144 USE_SHA1=NO | |
145 SHA1=NONE | |
146 SHA1_OPT= | |
147 SHA1_ASM=NO | |
148 | |
149 USE_ZLIB=NO | 139 USE_ZLIB=NO |
150 ZLIB=NONE | 140 ZLIB=NONE |
151 ZLIB_OPT= | 141 ZLIB_OPT= |
152 ZLIB_ASM=NO | 142 ZLIB_ASM=NO |
153 | 143 |
331 --with-pcre-jit) PCRE_JIT=YES ;; | 321 --with-pcre-jit) PCRE_JIT=YES ;; |
332 | 322 |
333 --with-openssl=*) OPENSSL="$value" ;; | 323 --with-openssl=*) OPENSSL="$value" ;; |
334 --with-openssl-opt=*) OPENSSL_OPT="$value" ;; | 324 --with-openssl-opt=*) OPENSSL_OPT="$value" ;; |
335 | 325 |
336 --with-md5=*) MD5="$value" ;; | 326 --with-md5=*) |
337 --with-md5-opt=*) MD5_OPT="$value" ;; | 327 NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG |
338 --with-md5-asm) MD5_ASM=YES ;; | 328 $0: warning: the \"--with-md5\" option is deprecated" |
339 | 329 ;; |
340 --with-sha1=*) SHA1="$value" ;; | 330 --with-md5-opt=*) |
341 --with-sha1-opt=*) SHA1_OPT="$value" ;; | 331 NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG |
342 --with-sha1-asm) SHA1_ASM=YES ;; | 332 $0: warning: the \"--with-md5-opt\" option is deprecated" |
333 ;; | |
334 --with-md5-asm) | |
335 NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG | |
336 $0: warning: the \"--with-md5-asm\" option is deprecated" | |
337 ;; | |
338 | |
339 --with-sha1=*) | |
340 NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG | |
341 $0: warning: the \"--with-sha1\" option is deprecated" | |
342 ;; | |
343 --with-sha1-opt=*) | |
344 NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG | |
345 $0: warning: the \"--with-sha1-opt\" option is deprecated" | |
346 ;; | |
347 --with-sha1-asm) | |
348 NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG | |
349 $0: warning: the \"--with-sha1-asm\" option is deprecated" | |
350 ;; | |
343 | 351 |
344 --with-zlib=*) ZLIB="$value" ;; | 352 --with-zlib=*) ZLIB="$value" ;; |
345 --with-zlib-opt=*) ZLIB_OPT="$value" ;; | 353 --with-zlib-opt=*) ZLIB_OPT="$value" ;; |
346 --with-zlib-asm=*) ZLIB_ASM="$value" ;; | 354 --with-zlib-asm=*) ZLIB_ASM="$value" ;; |
347 | 355 |
509 --with-pcre force PCRE library usage | 517 --with-pcre force PCRE library usage |
510 --with-pcre=DIR set path to PCRE library sources | 518 --with-pcre=DIR set path to PCRE library sources |
511 --with-pcre-opt=OPTIONS set additional build options for PCRE | 519 --with-pcre-opt=OPTIONS set additional build options for PCRE |
512 --with-pcre-jit build PCRE with JIT compilation support | 520 --with-pcre-jit build PCRE with JIT compilation support |
513 | 521 |
514 --with-md5=DIR set path to md5 library sources | |
515 --with-md5-opt=OPTIONS set additional build options for md5 | |
516 --with-md5-asm use md5 assembler sources | |
517 | |
518 --with-sha1=DIR set path to sha1 library sources | |
519 --with-sha1-opt=OPTIONS set additional build options for sha1 | |
520 --with-sha1-asm use sha1 assembler sources | |
521 | |
522 --with-zlib=DIR set path to zlib library sources | 522 --with-zlib=DIR set path to zlib library sources |
523 --with-zlib-opt=OPTIONS set additional build options for zlib | 523 --with-zlib-opt=OPTIONS set additional build options for zlib |
524 --with-zlib-asm=CPU use zlib assembler sources optimized | 524 --with-zlib-asm=CPU use zlib assembler sources optimized |
525 for the specified CPU, valid values: | 525 for the specified CPU, valid values: |
526 pentium, pentiumpro | 526 pentium, pentiumpro |