# HG changeset patch # User Igor Sysoev # Date 1243524645 0 # Node ID d5d3fe7197cc9764be5b73a56d687eaa81cd7e35 # Parent 22719ff8986f495fa0b860ef1e7472539196176a *) use no-threads for Unix builds only *) style fix diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make --- 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 + case $USE_THREADS in + NO) OPENSSL_OPT="$OPENSSL_OPT no-threads" ;; + *) OPENSSL_OPT="$OPENSSL_OPT threads" ;; + esac - /*) - ngx_prefix="$OPENSSL/openssl" - ;; - - *) - ngx_prefix="$PWD/$OPENSSL/openssl" - ;; - + case $OPENSSL in + /*) ngx_prefix="$OPENSSL/openssl" ;; + *) ngx_prefix="$PWD/$OPENSSL/openssl" ;; esac cat << END >> $NGX_MAKEFILE