diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-05-19 12:12:36 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-05-19 12:12:36 +0000 |
| commit | 8407ff24ab5579a5b44ba7c2cce1ac44b1066720 (patch) | |
| tree | 92dd1a04ed9761424cd52938eb388a9f3e318645 | |
| parent | cfa2ee27957e7c4261d89f8f68d01fda20551a14 (diff) | |
| download | nginx-8407ff24ab5579a5b44ba7c2cce1ac44b1066720.tar.gz nginx-8407ff24ab5579a5b44ba7c2cce1ac44b1066720.tar.bz2 | |
fix building OpenSSL on Unix
| -rw-r--r-- | auto/lib/openssl/conf | 7 | ||||
| -rw-r--r-- | auto/lib/openssl/make | 17 |
2 files changed, 10 insertions, 14 deletions
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf index f50af31cf..8716339ee 100644 --- 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 bfe9a3f31..0700891cf 100644 --- 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 |