do not use prebuild OpenSSL Win32 libraries

diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
index c57a7c830675b5e5cd9cf0f49388cdbea82e2490..741e946f7c9392ebad4a02eab2808d867d65f5dc 100644 (file)
--- 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