diff options
author | Igor Sysoev <igor@sysoev.ru> | 2009-05-18 16:17:51 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2009-05-18 16:17:51 +0000 |
commit | c0399e22bb3f1ec7b7074cf078b0146cbb57d448 (patch) | |
tree | ee9ce2a4e1cec939ee9457b90bc78117d63ba14e | |
parent | 0e7ed23cec70cec3e6bce9a90e2f45708b658e46 (diff) | |
download | nginx-c0399e22bb3f1ec7b7074cf078b0146cbb57d448.tar.gz |
r2756 merge:
add quotes for configure options with spaces
-rwxr-xr-x | auto/configure | 2 | ||||
-rw-r--r-- | auto/options | 6 | ||||
-rw-r--r-- | src/core/nginx.c | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/auto/configure b/auto/configure index 00a7f4872..8cef6df36 100755 --- 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 index 268ece99c..8a1b8b25e 100644 --- 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 index 28624db76..05d26eefc 100644 --- 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; |