# HG changeset patch # User Igor Sysoev # Date 1242663471 0 # Node ID 1804da35f85310021ca1e3e337a3a8431108d4fa # Parent e8f271979e0ab9df3f291f7e9c5a85b295c92c7c r2756 merge: add quotes for configure options with spaces diff --git a/auto/configure b/auto/configure --- a/auto/configure +++ b/auto/configure @@ -3,8 +3,6 @@ # Copyright (C) Igor Sysoev -NGX_CONFIGURE=`echo $@ | sed 's/"/\\\\"/g'` - . auto/options . auto/init . auto/sources diff --git a/auto/options b/auto/options --- a/auto/options +++ b/auto/options @@ -119,9 +119,12 @@ NGX_GOOGLE_PERFTOOLS=NO NGX_CPU_CACHE_LINE= +opt= for option do + opt="$opt `echo $option | sed -e \"s/\(--[^=]*=\)\(.* .*\)/\1'\2'/\"`" + case "$option" in -*=*) value=`echo "$option" | sed -e 's/[-_a-zA-Z0-9]*=//'` ;; *) value="" ;; @@ -248,6 +251,9 @@ do done +NGX_CONFIGURE="$opt" + + if [ $help = yes ]; then cat << END diff --git a/src/core/nginx.c b/src/core/nginx.c --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -261,8 +261,8 @@ main(int argc, char *const *argv) } #endif - p = "configure arguments: " NGX_CONFIGURE CRLF; - n = sizeof("configure arguments :" NGX_CONFIGURE CRLF) - 1; + p = "configure arguments:" NGX_CONFIGURE CRLF; + n = sizeof("configure arguments:" NGX_CONFIGURE CRLF) - 1; if (ngx_write_fd(ngx_stderr_fileno, p, n) != n) { return 1;