diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-07-08 19:51:47 +0400 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-07-08 19:51:47 +0400 |
| commit | db0efa80522cd612b677972457038cb177a444a4 (patch) | |
| tree | f030b41cb08fe61aa101c97dcc78cdbcabaff6b1 /auto/lib/openssl | |
| parent | f9dd541edbf3c6e07c66745f5f373a55d6bbba86 (diff) | |
do not use prebuild OpenSSL Win32 libraries
Diffstat (limited to 'auto/lib/openssl')
| -rw-r--r-- | auto/lib/openssl/conf | 52 |
1 files changed, 18 insertions, 34 deletions
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf index c57a7c830..741e946f7 100644 --- a/auto/lib/openssl/conf +++ b/auto/lib/openssl/conf @@ -37,38 +37,24 @@ if [ $OPENSSL != NONE ]; then else - case "$NGX_PLATFORM" in + if [ "$NGX_PLATFORM" != win32 ]; then - win32) - have=NGX_OPENSSL . auto/have - have=NGX_SSL . auto/have - OPENSSL=YES - - CORE_INCS="$CORE_INCS c:/openssl/include" - CORE_LIBS="$CORE_LIBS c:/openssl/ssleay32.lib" - CORE_LIBS="$CORE_LIBS c:/openssl/libeay32.lib" + OPENSSL=NO - # libeay32.lib requires gdi32.lib - CORE_LIBS="$CORE_LIBS gdi32.lib" - ;; + 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 - *) - 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 - - 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 library statically from the source with nginx by using --with-openssl=<path> option. END - exit 1 - fi - ;; - - esac + exit 1 + fi + fi fi |