diff options
author | Igor Sysoev <igor@sysoev.ru> | 2004-07-25 22:34:14 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2004-07-25 22:34:14 +0400 |
commit | 0599b11937990b169c05f95eeaed7cf22d823740 (patch) | |
tree | 3e52ebeadd8d0442e33ae96ec0ae9a755aa54696 /auto/lib | |
parent | a2b360d0b9196a130f9e39184edde69076d906ed (diff) |
nginx-0.0.7-2004-07-25-22:34:14 import
Diffstat (limited to 'auto/lib')
-rw-r--r-- | auto/lib/conf | 4 | ||||
-rw-r--r-- | auto/lib/make | 4 | ||||
-rw-r--r-- | auto/lib/openssl/conf | 40 | ||||
-rw-r--r-- | auto/lib/openssl/make | 13 |
4 files changed, 61 insertions, 0 deletions
diff --git a/auto/lib/conf b/auto/lib/conf index 163193fb1..af2e9d7f8 100644 --- a/auto/lib/conf +++ b/auto/lib/conf @@ -7,6 +7,10 @@ if [ $USE_MD5 = YES ]; then . auto/lib/md5/conf fi +if [ $USE_OPENSSL = YES ]; then + . auto/lib/openssl/conf +fi + if [ $USE_ZLIB = YES ]; then . auto/lib/zlib/conf fi diff --git a/auto/lib/make b/auto/lib/make index 2c2d23286..377fc7aa7 100644 --- a/auto/lib/make +++ b/auto/lib/make @@ -7,6 +7,10 @@ if [ $MD5 != NONE -a $MD5 != NO -a $MD5 != YES ]; then . auto/lib/md5/make fi +if [ $OPENSSL != NONE -a $OPENSSL != NO -a $OPENSSL != YES ]; then + . auto/lib/openssl/make +fi + if [ $ZLIB != NONE -a $ZLIB != NO -a $ZLIB != YES ]; then . auto/lib/zlib/make fi diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf new file mode 100644 index 000000000..28dbf665d --- /dev/null +++ b/auto/lib/openssl/conf @@ -0,0 +1,40 @@ + +if [ $OPENSSL != NONE ]; then + CORE_INCS="$CORE_INCS $OPENSSL/include" + CORE_DEPS="$CORE_DEPS $OPENSSL_DEPS" + CORE_SRCS="$CORE_SRCS $OPENSSL_SRCS" + + case "$CC" in + *) + have=NGX_OPENSSL . auto/have + LINK_DEPS="$LINK_DEPS $OPENSSL/libssl.a $OPENSSL/libcrypto.a" + CORE_LIBS="$CORE_LIBS $OPENSSL/libssl.a $OPENSSL/libcrypto.a" + ;; + + esac + +else + + if [ $PLATFORM != win32 ]; then + OPENSSL=NO + ngx_lib_cflags= + + ngx_lib_inc="#include <openssl/ssl.h>" + ngx_lib="OpenSSL library" + ngx_lib_test="SSL_library_init()" + ngx_libs="-lssl -lcrypto" + . auto/lib/test + + + if [ $ngx_found = yes ]; then + have=NGX_OPENSSL . auto/have + CORE_DEPS="$CORE_DEPS $OPENSSL_DEPS" + CORE_SRCS="$CORE_SRCS $OPENSSL_SRCS" + CORE_LIBS="$CORE_LIBS $ngx_libs" + OPENSSL=YES + ngx_found=no + fi + + fi + +fi diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make new file mode 100644 index 000000000..8631ff345 --- /dev/null +++ b/auto/lib/openssl/make @@ -0,0 +1,13 @@ + +case $PLATFORM in + *) + echo "$OPENSSL/libssl.a:" >> $MAKEFILE + echo " cd $OPENSSL \\" >> $MAKEFILE + echo " && CC=\"\$(CC)\" \\" >> $MAKEFILE + echo " ./config threads no-shared \\" >> $MAKEFILE + echo " && \$(MAKE)" >> $MAKEFILE + ;; + +esac + +echo >> $MAKEFILE |