diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-05-28 15:30:45 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-05-28 15:30:45 +0000 |
| commit | 0022826d18c6e4d86fa57ea8e5894258bf44d227 (patch) | |
| tree | a5ce061f7cc36c29622873153f69ff862b5489d0 | |
| parent | d921c104348e8d5b0ff0a83b45eef3611bfcf185 (diff) | |
| download | nginx-0022826d18c6e4d86fa57ea8e5894258bf44d227.tar.gz nginx-0022826d18c6e4d86fa57ea8e5894258bf44d227.tar.bz2 | |
*) use no-threads for Unix builds only
*) style fix
| -rw-r--r-- | auto/lib/openssl/make | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make index 6646cb2a4..3c21f436b 100644 --- a/auto/lib/openssl/make +++ b/auto/lib/openssl/make @@ -2,11 +2,6 @@ # Copyright (C) Igor Sysoev -case $USE_THREADS in - NO) OPENSSL_OPT="$OPENSSL_OPT no-threads" ;; - *) OPENSSL_OPT="$OPENSSL_OPT threads" ;; -esac - case "$CC" in cl) @@ -21,7 +16,7 @@ END ;; - cl | bcc32) + bcc32) ngx_opt=`echo "-DOPENSSL=\"$OPENSSL\" -DOPENSSL_OPT=\"$OPENSSL_OPT\"" \ | sed -e "s/\//$ngx_regex_dirsep/g"` @@ -45,16 +40,14 @@ END ;; *) - case $OPENSSL in - - /*) - ngx_prefix="$OPENSSL/openssl" - ;; - - *) - ngx_prefix="$PWD/$OPENSSL/openssl" - ;; + case $USE_THREADS in + NO) OPENSSL_OPT="$OPENSSL_OPT no-threads" ;; + *) OPENSSL_OPT="$OPENSSL_OPT threads" ;; + esac + case $OPENSSL in + /*) ngx_prefix="$OPENSSL/openssl" ;; + *) ngx_prefix="$PWD/$OPENSSL/openssl" ;; esac cat << END >> $NGX_MAKEFILE |