IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix building OpenSSL on Unix

Browse Source
This commit is contained in:
Igor Sysoev 2009-05-19 12:12:36 +00:00
parent cfa2ee2795
commit 8407ff24ab
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
auto/lib/openssl/conf
View File

@ -25,9 +25,10 @@ if [ $OPENSSL != NONE ]; then
have=NGX_OPENSSL . auto/have have=NGX_OPENSSL . auto/have
have=NGX_SSL . auto/have have=NGX_SSL . auto/have
CORE_INCS="$CORE_INCS $OPENSSL/include" CORE_INCS="$CORE_INCS $OPENSSL/openssl/include"
LINK_DEPS="$LINK_DEPS $OPENSSL/libssl.a $OPENSSL/libcrypto.a" CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h"
CORE_LIBS="$CORE_LIBS $OPENSSL/libssl.a $OPENSSL/libcrypto.a" CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libssl.a"
CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libcrypto.a"
;; ;;
esac esac

17
auto/lib/openssl/make
View File

@ -2,15 +2,9 @@
# Copyright (C) Igor Sysoev # 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 case $USE_THREADS in
NO) NGX_OPENSSL_CONFIG="$NGX_OPENSSL_CONFIG no-threads" ;; NO) OPENSSL_OPT="$OPENSSL_OPT no-threads" ;;
*) NGX_OPENSSL_CONFIG="$NGX_OPENSSL_CONFIG threads" ;; *) OPENSSL_OPT="$OPENSSL_OPT threads" ;;
esac esac
case "$CC" in case "$CC" in
@ -53,11 +47,12 @@ END
*) *)
cat << END >> $NGX_MAKEFILE cat << END >> $NGX_MAKEFILE
$OPENSSL/libssl.a: $NGX_MAKEFILE $OPENSSL/openssl/include/openssl/ssl.h: $NGX_MAKEFILE
cd $OPENSSL \\ cd $OPENSSL \\
&& \$(MAKE) clean \\ && \$(MAKE) clean \\
&& $NGX_OPENSSL_CONFIG no-shared \\ && ./config --prefix=$PWD/$OPENSSL/openssl no-shared $OPENSSL_OPT \\
&& \$(MAKE) && \$(MAKE) \\
&& \$(MAKE) install
END END