Mercurial > hg > nginx-ranges

comparison auto/lib/openssl/conf @ 635:e67b227c8dbb default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:07:55 +0400
parents 53f5f04a64b8
children
comparison
equal deleted inserted replaced
578:f3a9e57d2e17 635:e67b227c8dbb
17 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib" 17 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib"
18 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib" 18 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib"
19 19
20 # libeay32.lib requires gdi32.lib 20 # libeay32.lib requires gdi32.lib
21 CORE_LIBS="$CORE_LIBS gdi32.lib" 21 CORE_LIBS="$CORE_LIBS gdi32.lib"
22 # OpenSSL 1.0.0 requires crypt32.lib
23 CORE_LIBS="$CORE_LIBS crypt32.lib"
22 ;; 24 ;;
23 25
24 *) 26 *)
25 have=NGX_OPENSSL . auto/have 27 have=NGX_OPENSSL . auto/have
26 have=NGX_SSL . auto/have 28 have=NGX_SSL . auto/have
33 ;; 35 ;;
34 esac 36 esac
35 37
36 else 38 else
37 39
38 case "$NGX_PLATFORM" in 40 if [ "$NGX_PLATFORM" != win32 ]; then
39 41
40 win32) 42 OPENSSL=NO
41 have=NGX_OPENSSL . auto/have 43
44 ngx_feature="OpenSSL library"
45 ngx_feature_name="NGX_OPENSSL"
46 ngx_feature_run=no
47 ngx_feature_incs="#include <openssl/ssl.h>"
48 ngx_feature_path=
49 ngx_feature_libs="-lssl -lcrypto"
50 ngx_feature_test="SSL_library_init()"
51 . auto/feature
52
53 if [ $ngx_found = yes ]; then
42 have=NGX_SSL . auto/have 54 have=NGX_SSL . auto/have
55 CORE_LIBS="$CORE_LIBS $ngx_feature_libs $NGX_LIBDL"
43 OPENSSL=YES 56 OPENSSL=YES
57 fi
58 fi
44 59
45 CORE_INCS="$CORE_INCS c:/openssl/include" 60 if [ $OPENSSL != YES ]; then
46 CORE_LIBS="$CORE_LIBS c:/openssl/ssleay32.lib"
47 CORE_LIBS="$CORE_LIBS c:/openssl/libeay32.lib"
48
49 # libeay32.lib requires gdi32.lib
50 CORE_LIBS="$CORE_LIBS gdi32.lib"
51 ;;
52
53 *)
54 OPENSSL=NO
55
56 ngx_feature="OpenSSL library"
57 ngx_feature_name="NGX_OPENSSL"
58 ngx_feature_run=no
59 ngx_feature_incs="#include <openssl/ssl.h>"
60 ngx_feature_path=
61 ngx_feature_libs="-lssl -lcrypto"
62 ngx_feature_test="SSL_library_init()"
63 . auto/feature
64
65 if [ $ngx_found = yes ]; then
66 have=NGX_SSL . auto/have
67 CORE_LIBS="$CORE_LIBS $ngx_feature_libs $NGX_LIBDL"
68 OPENSSL=YES
69 else
70 61
71 cat << END 62 cat << END
72 63
73 $0: error: SSL modules require the OpenSSL library. 64 $0: error: SSL modules require the OpenSSL library.
74 You can either do not enable the modules, or install the OpenSSL library 65 You can either do not enable the modules, or install the OpenSSL library
75 into the system, or build the OpenSSL library statically from the source 66 into the system, or build the OpenSSL library statically from the source
76 with nginx by using --with-openssl=<path> option. 67 with nginx by using --with-openssl=<path> option.
77 68
78 END 69 END
79 exit 1 70 exit 1
80 fi 71 fi
81 ;;
82
83 esac
84 72
85 fi 73 fi