Mercurial > hg > nginx-quic
changeset 2866:1804da35f853 stable-0.6
r2756 merge:
add quotes for configure options with spaces
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 18 May 2009 16:17:51 +0000 |
parents | e8f271979e0a |
children | 7a10334d4bce |
files | auto/configure auto/options src/core/nginx.c |
diffstat | 3 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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;