diff options
Diffstat (limited to '')
| -rw-r--r-- | auto/lib/openssl/conf | 2 | ||||
| -rw-r--r-- | auto/lib/openssl/make | 2 | ||||
| -rw-r--r-- | auto/lib/openssl/makefile.bcc | 3 | ||||
| -rw-r--r-- | auto/lib/openssl/makefile.msvc | 3 |
4 files changed, 5 insertions, 5 deletions
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf index 64f2ce02f..c57a7c830 100644 --- a/auto/lib/openssl/conf +++ b/auto/lib/openssl/conf @@ -19,6 +19,8 @@ if [ $OPENSSL != NONE ]; then # libeay32.lib requires gdi32.lib CORE_LIBS="$CORE_LIBS gdi32.lib" + # OpenSSL 1.0.0 requires crypt32.lib + CORE_LIBS="$CORE_LIBS crypt32.lib" ;; *) diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make index d497d88e1..a2025bbd6 100644 --- a/auto/lib/openssl/make +++ b/auto/lib/openssl/make @@ -57,7 +57,7 @@ $OPENSSL/.openssl/include/openssl/ssl.h: $NGX_MAKEFILE && \$(MAKE) clean \\ && ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\ && \$(MAKE) \\ - && \$(MAKE) install + && \$(MAKE) install LIBDIR=lib END diff --git a/auto/lib/openssl/makefile.bcc b/auto/lib/openssl/makefile.bcc index 679e7fe4a..5938cbf6b 100644 --- a/auto/lib/openssl/makefile.bcc +++ b/auto/lib/openssl/makefile.bcc @@ -5,8 +5,7 @@ all: cd $(OPENSSL) - perl Configure BC-32 no-shared --prefix=openssl -DNO_SYS_TYPES_H \ - $(OPENSSL_OPT) + perl Configure BC-32 no-shared --prefix=openssl $(OPENSSL_OPT) ms\do_nasm diff --git a/auto/lib/openssl/makefile.msvc b/auto/lib/openssl/makefile.msvc index 0e45c487f..379b95dc0 100644 --- a/auto/lib/openssl/makefile.msvc +++ b/auto/lib/openssl/makefile.msvc @@ -5,8 +5,7 @@ all: cd $(OPENSSL) - perl Configure VC-WIN32 no-shared --prefix=openssl -DNO_SYS_TYPES_H \ - $(OPENSSL_OPT) + perl Configure VC-WIN32 no-shared --prefix=openssl $(OPENSSL_OPT) ms\do_ms |