[PATCH] auto/lib/conf: fix PCRE condition WRT the http and http_rewrite options

[Ruslan Ermilov]

http://hg.nginx.org/nginx/rev/cc7ff76df927

On Sat, Jul 15, 2017 at 01:37:19PM +0300, Ruslan Ermilov wrote:
> On Fri, Jul 14, 2017 at 01:25:13PM +0300, Maxim Dounin wrote:
> > On Fri, Jul 14, 2017 at 12:08:45PM +0200, Samuel Martin wrote:
> > 
> > > http_rewrite module cannot be selected when http server is disabled, so
> > > fix the PCRE check condition to avoid irrelevant check failure.
[...]
> > Seems to be a regression from 4d874b4d82ed (1.11.11), 
> > http://hg.nginx.org/nginx/rev/4d874b4d82ed.
> > 
> > Ruslan, please take a look.
> 
> Suggest to commit the following:
> 
> # HG changeset patch
> # User Ruslan Ermilov <ru at nginx.com>
> # Date 1500114987 -10800
> #      Sat Jul 15 13:36:27 2017 +0300
> # Node ID 207fda85a217a950875540633c4adb72a2f24dfe
> # Parent  a27e0c7e198ce989a181fba3c22d0c17e18f84a0
> Configure: fixed PCRE requirement check by ngx_http_rewrite_module.
> 
> The http_rewrite module cannot be selected when http is disabled.
> Fixed the PCRE check condition to avoid irrelevant check failure.
> This is a regression from 4d874b4d82ed.
> 
> Signed-off-by: Samuel Martin <s.martin49 at gmail.com>
> 
> diff --git a/auto/lib/conf b/auto/lib/conf
> --- a/auto/lib/conf
> +++ b/auto/lib/conf
> @@ -7,7 +7,7 @@ if [ $USE_PCRE = YES -o $PCRE != NONE ];
>      . auto/lib/pcre/conf
>  
>  else
> -    if [ $USE_PCRE = DISABLED -a $HTTP_REWRITE = YES ]; then
> +    if [ $USE_PCRE = DISABLED -a $HTTP = YES -a $HTTP_REWRITE = YES ]; then
>  
>  cat << END


-- 
Ruslan Ermilov

Join us at nginx.conf, Sep. 6-8, Portland, OR
https://www.nginx.com/nginxconf