On Wed, Jun 10, 2015 at 07:19:29PM -0700, Piotr Sikora wrote:
> # HG changeset patch
> # User Piotr Sikora <piotr@cloudflare.com>
> # Date 1433989099 25200
> # Wed Jun 10 19:18:19 2015 -0700
> # Node ID 4ee03ff4811708bafd07e84c5a71165a52b38299
> # Parent c041f1e0655f786db5cf1a3e79ca1f464fec0258
> Configure: fix tests with multi-level relative build directory.
>
> Signed-off-by: Piotr Sikora <piotr@cloudflare.com>
>
> diff -r c041f1e0655f -r 4ee03ff48117 auto/unix
> --- a/auto/unix Wed Jun 10 19:18:20 2015 +0300
> +++ b/auto/unix Wed Jun 10 19:18:19 2015 -0700
> @@ -510,7 +510,7 @@ case "$NGX_AUTO_CONFIG_H" in
> NGX_INCLUDE_AUTO_CONFIG_H="#include \"$NGX_AUTO_CONFIG_H\""
> ;;
> *)
> - NGX_INCLUDE_AUTO_CONFIG_H="#include \"../$NGX_AUTO_CONFIG_H\""
> + NGX_INCLUDE_AUTO_CONFIG_H="#include \"$PWD/$NGX_AUTO_CONFIG_H\""
> ;;
> esac

How's this instead?

diff --git a/auto/unix b/auto/unix
--- a/auto/unix
+++ b/auto/unix
@@ -505,14 +505,7 @@ ngx_param=NGX_PTR_SIZE; ngx_value=$ngx_s

# POSIX types

-case "$NGX_AUTO_CONFIG_H" in
- /*)
- NGX_INCLUDE_AUTO_CONFIG_H="#include \"$NGX_AUTO_CONFIG_H\""
- ;;
- *)
- NGX_INCLUDE_AUTO_CONFIG_H="#include \"../$NGX_AUTO_CONFIG_H\""
- ;;
-esac
+NGX_INCLUDE_AUTO_CONFIG_H="#include \"ngx_auto_config.h\""

ngx_type="uint64_t"; ngx_types="u_int64_t"; . auto/types/typedef


_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel