From 0022826d18c6e4d86fa57ea8e5894258bf44d227 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Thu, 28 May 2009 15:30:45 +0000 Subject: [PATCH] *) use no-threads for Unix builds only *) style fix --- auto/lib/openssl/make | 23 ++++++++--------------- 1 file 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 $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" - ;; - + /*) ngx_prefix="$OPENSSL/openssl" ;; + *) ngx_prefix="$PWD/$OPENSSL/openssl" ;; esac cat << END >> $NGX_MAKEFILE