fix building OpenSSL on Unix

diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
index f50af31cf637ab62167ecd06b640756b2f255bfa..8716339ee2c91e15a557a01c6ef1e1c8331f0c48 100644 (file)
--- a/auto/lib/openssl/conf
+++ b/auto/lib/openssl/conf
@@ -25,9 +25,10 @@ if [ $OPENSSL != NONE ]; then
             have=NGX_OPENSSL . auto/have
             have=NGX_SSL . auto/have
 
-            CORE_INCS="$CORE_INCS $OPENSSL/include"
-            LINK_DEPS="$LINK_DEPS $OPENSSL/libssl.a $OPENSSL/libcrypto.a"
-            CORE_LIBS="$CORE_LIBS $OPENSSL/libssl.a $OPENSSL/libcrypto.a"
+            CORE_INCS="$CORE_INCS $OPENSSL/openssl/include"
+            CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h"
+            CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libssl.a"
+            CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libcrypto.a"
         ;;
     esac
 

diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make
index bfe9a3f319c800c04586f4444945b263cbdc20d2..0700891cff61f5b77db1eb7adde3ba3d9e586325 100644 (file)
--- a/auto/lib/openssl/make
+++ b/auto/lib/openssl/make
@@ -2,15 +2,9 @@
 # Copyright (C) Igor Sysoev
 
 
-if test -n "$OPENSSL_OPT"; then
-    NGX_OPENSSL_CONFIG="./Configure $OPENSSL_OPT"
-else
-    NGX_OPENSSL_CONFIG="./config"
-fi
-
 case $USE_THREADS in
-    NO) NGX_OPENSSL_CONFIG="$NGX_OPENSSL_CONFIG no-threads" ;;
-    *)  NGX_OPENSSL_CONFIG="$NGX_OPENSSL_CONFIG threads" ;;
+    NO) OPENSSL_OPT="$OPENSSL_OPT no-threads" ;;
+    *)  OPENSSL_OPT="$OPENSSL_OPT threads" ;;
 esac
 
 case "$CC" in
@@ -53,11 +47,12 @@ END
     *)
         cat << END                                            >> $NGX_MAKEFILE
 
-$OPENSSL/libssl.a:     $NGX_MAKEFILE
+$OPENSSL/openssl/include/openssl/ssl.h:        $NGX_MAKEFILE
        cd $OPENSSL \\
        && \$(MAKE) clean \\
-       && $NGX_OPENSSL_CONFIG no-shared \\
-       && \$(MAKE)
+       && ./config --prefix=$PWD/$OPENSSL/openssl no-shared $OPENSSL_OPT \\
+       && \$(MAKE) \\
+       && \$(MAKE) install
 
 END