Mercurial > hg > nginx

comparison auto/lib/openssl/make @ 3430:966f9cf9c7da stable-0.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge r3155, r3156, r3160, r969, r3191, r3197, r3358: SSL fixes: *) $ssl_session_id *) allow "make clean" for OpenSSL, the bug was introduced in r2874 *) disable SSLv2 and use only strong ciphers by default *) decrease SSL handshake error level to info
author Igor Sysoev <igor@sysoev.ru>
date Mon, 01 Feb 2010 14:39:16 +0000
parents 87da6664fb49
children ee529182e59f
comparison
equal deleted inserted replaced
3429:9ecd253fcc90 3430:966f9cf9c7da
44 NO) OPENSSL_OPT="$OPENSSL_OPT no-threads" ;; 44 NO) OPENSSL_OPT="$OPENSSL_OPT no-threads" ;;
45 *) OPENSSL_OPT="$OPENSSL_OPT threads" ;; 45 *) OPENSSL_OPT="$OPENSSL_OPT threads" ;;
46 esac 46 esac
47 47
48 case $OPENSSL in 48 case $OPENSSL in
49 /*) ngx_prefix="$OPENSSL/openssl" ;; 49 /*) ngx_prefix="$OPENSSL/.openssl" ;;
50 *) ngx_prefix="$PWD/$OPENSSL/openssl" ;; 50 *) ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
51 esac 51 esac
52 52
53 cat << END >> $NGX_MAKEFILE 53 cat << END >> $NGX_MAKEFILE
54 54
55 $OPENSSL/openssl/include/openssl/ssl.h: $NGX_MAKEFILE 55 $OPENSSL/.openssl/include/openssl/ssl.h: $NGX_MAKEFILE
56 cd $OPENSSL \\ 56 cd $OPENSSL \\
57 && \$(MAKE) clean \\ 57 && \$(MAKE) clean \\
58 && ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\ 58 && ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\
59 && \$(MAKE) \\ 59 && \$(MAKE) \\
60 && \$(MAKE) install 60 && \$(MAKE) install