[PATCH] Configure: don't test alternatives if preferred feature is found

Maxim Dounin mdounin at mdounin.ru
Thu Jun 30 14:16:44 UTC 2016


Hello!

On Tue, Jun 28, 2016 at 03:28:31PM -0700, Piotr Sikora wrote:

> # HG changeset patch
> # User Piotr Sikora <piotrsikora at google.com>
> # Date 1467064812 25200
> #      Mon Jun 27 15:00:12 2016 -0700
> # Node ID 9e0d65eda7fa016c0aebddf898d6f3f5834351f1
> # Parent  d452cb27639f714bc43b7f3ede417e3e7f8efdd6
> Configure: don't test alternatives if preferred feature is found.

[...]

> @@ -356,28 +373,36 @@ ngx_feature_test="setsockopt(0, IPPROTO_
>  
>  # Linux transparent proxying
>  
> -ngx_feature="IP_TRANSPARENT"
> -ngx_feature_name="NGX_HAVE_TRANSPARENT_PROXY"
> -ngx_feature_run=no
> -ngx_feature_incs="#include <sys/socket.h>
> -                  #include <netinet/in.h>"
> -ngx_feature_path=
> -ngx_feature_libs=
> -ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_TRANSPARENT, NULL, 0)"
> -. auto/feature
> +if [ $ngx_found = no ]; then
> +
> +    ngx_feature="IP_TRANSPARENT"
> +    ngx_feature_name="NGX_HAVE_TRANSPARENT_PROXY"

This looks like a mismerge, as previous tests is about 
IP_BIND_ADDRESS_NO_PORT (it is probably misplaced though).

-- 
Maxim Dounin
http://nginx.org/



More information about the nginx-devel mailing list