Mercurial > hg > nginx
changeset 3683:312c2f9b53ac
do not use prebuild OpenSSL Win32 libraries
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Thu, 08 Jul 2010 15:51:47 +0000 |
| parents | e76fbd1a49f3 |
| children | 4d47a0658e7d |
| files | auto/lib/openssl/conf |
| diffstat | 1 files changed, 18 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/lib/openssl/conf +++ b/auto/lib/openssl/conf @@ -37,38 +37,24 @@ if [ $OPENSSL != NONE ]; then else - case "$NGX_PLATFORM" in - - win32) - have=NGX_OPENSSL . auto/have - have=NGX_SSL . auto/have - OPENSSL=YES + if [ "$NGX_PLATFORM" != win32 ]; then - CORE_INCS="$CORE_INCS c:/openssl/include" - CORE_LIBS="$CORE_LIBS c:/openssl/ssleay32.lib" - CORE_LIBS="$CORE_LIBS c:/openssl/libeay32.lib" - - # libeay32.lib requires gdi32.lib - CORE_LIBS="$CORE_LIBS gdi32.lib" - ;; + OPENSSL=NO - *) - OPENSSL=NO + ngx_feature="OpenSSL library" + ngx_feature_name="NGX_OPENSSL" + ngx_feature_run=no + ngx_feature_incs="#include <openssl/ssl.h>" + ngx_feature_path= + ngx_feature_libs="-lssl -lcrypto" + ngx_feature_test="SSL_library_init()" + . auto/feature - ngx_feature="OpenSSL library" - ngx_feature_name="NGX_OPENSSL" - ngx_feature_run=no - ngx_feature_incs="#include <openssl/ssl.h>" - ngx_feature_path= - ngx_feature_libs="-lssl -lcrypto" - ngx_feature_test="SSL_library_init()" - . auto/feature - - if [ $ngx_found = yes ]; then - have=NGX_SSL . auto/have - CORE_LIBS="$CORE_LIBS $ngx_feature_libs $NGX_LIBDL" - OPENSSL=YES - else + if [ $ngx_found = yes ]; then + have=NGX_SSL . auto/have + CORE_LIBS="$CORE_LIBS $ngx_feature_libs $NGX_LIBDL" + OPENSSL=YES + else cat << END @@ -78,10 +64,8 @@ into the system, or build the OpenSSL li with nginx by using --with-openssl=<path> option. END - exit 1 - fi - ;; - - esac + exit 1 + fi + fi fi