Mercurial > hg > nginx

changeset 2755:a65976a205a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add quotes for configure options with spaces
author Igor Sysoev <igor@sysoev.ru>
date Sun, 26 Apr 2009 19:37:38 +0000
parents 7d16774c757c
children 09cab3f8d92e
files auto/configure auto/options src/core/nginx.c
diffstat 3 files changed, 7 insertions(+), 3 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
@@ -129,9 +129,12 @@ NGX_CPP_TEST=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="" ;;
@@ -267,6 +270,9 @@ do
 done
 
 
+NGX_CONFIGURE="$opt"
+
+
 if [ $help = yes ]; then
 
 cat << END
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -232,7 +232,7 @@ main(int argc, char *const *argv)
 #ifdef NGX_COMPILER
             ngx_log_stderr(0, "built by " NGX_COMPILER);
 #endif
-            ngx_log_stderr(0, "configure arguments: " NGX_CONFIGURE);
+            ngx_log_stderr(0, "configure arguments:" NGX_CONFIGURE);
         }
 
         if (!ngx_test_config) {