Mercurial > hg > nginx
changeset 2873:e069d0b8b198
fix building OpenSSL on Unix
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Tue, 19 May 2009 12:12:36 +0000 |
| parents | 01b999a7adc2 |
| children | e16e03d62435 |
| files | auto/lib/openssl/conf auto/lib/openssl/make |
| diffstat | 2 files changed, 10 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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