diff options
author | Igor Sysoev <igor@sysoev.ru> | 2004-04-18 23:06:02 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2004-04-18 23:06:02 +0400 |
commit | 9bfb434d241816749077e21f499b8efd41c3625d (patch) | |
tree | defc89b07684b0bd31b77dd61825893e434392ba /auto/lib | |
parent | 32075f53e94183c647da58d4d832a58725d36c49 (diff) |
nginx-0.0.3-2004-04-18-23:06:02 import
Diffstat (limited to 'auto/lib')
-rw-r--r-- | auto/lib/make | 6 | ||||
-rw-r--r-- | auto/lib/md5/conf | 32 | ||||
-rw-r--r-- | auto/lib/pcre/conf | 4 | ||||
-rw-r--r-- | auto/lib/zlib/conf | 5 | ||||
-rw-r--r-- | auto/lib/zlib/make | 5 |
5 files changed, 33 insertions, 19 deletions
diff --git a/auto/lib/make b/auto/lib/make index 7acae504f..2c2d23286 100644 --- a/auto/lib/make +++ b/auto/lib/make @@ -1,12 +1,12 @@ -if [ $PCRE != NONE -a $PCRE != NO ]; then +if [ $PCRE != NONE -a $PCRE != NO -a $PCRE != YES ]; then . auto/lib/pcre/make fi -if [ $MD5 != NONE -a $MD5 != NO ]; then +if [ $MD5 != NONE -a $MD5 != NO -a $MD5 != YES ]; then . auto/lib/md5/make fi -if [ $ZLIB != NONE -a $ZLIB != NO ]; then +if [ $ZLIB != NONE -a $ZLIB != NO -a $ZLIB != YES ]; then . auto/lib/zlib/make fi diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf index 8871038b0..3fc1af608 100644 --- a/auto/lib/md5/conf +++ b/auto/lib/md5/conf @@ -41,16 +41,17 @@ if [ $MD5 != NONE ]; then else if [ $PLATFORM != win32 ]; then - MD5=NO + MD5=NO + ngx_lib_cflags= - # Solaris 8/9 + # Solaris 8/9 - ngx_lib_inc="#include <sys/types.h> + ngx_lib_inc="#include <sys/types.h> #include <md5.h>" - ngx_lib="rsaref md5 library" - ngx_lib_test="MD5_CTX md5; MD5Init(&md5)" - ngx_libs=-lmd5 - . auto/lib/test + ngx_lib="rsaref md5 library" + ngx_lib_test="MD5_CTX md5; MD5Init(&md5)" + ngx_libs=-lmd5 + . auto/lib/test if [ $ngx_found = yes ]; then @@ -64,7 +65,7 @@ else ngx_lib="rsaref md library" ngx_lib_test="MD5_CTX md5; MD5Init(&md5)" - ngx_libs=-lmd + #ngx_libs=-lmd . auto/lib/test fi @@ -76,13 +77,16 @@ else ngx_found=no else - # OpenSSL crypto library + if [ $MD5 = NO ]; then - ngx_inc="#include <openssl/md5.h>" - ngx_lib="OpenSSL md5 crypto library" - ngx_lib_test="MD5_CTX md5; MD5_Init(&md5)" - ngx_libs=-lcrypto - . auto/lib/test + # OpenSSL crypto library + + ngx_lib_inc="#include <openssl/md5.h>" + ngx_lib="OpenSSL md5 crypto library" + ngx_lib_test="MD5_CTX md5; MD5_Init(&md5)" + ngx_libs=-lcrypto + . auto/lib/test + fi fi diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf index a2ab1c6b5..29c561b81 100644 --- a/auto/lib/pcre/conf +++ b/auto/lib/pcre/conf @@ -41,6 +41,9 @@ else if [ $PLATFORM != win32 ]; then PCRE=NO + ngx_lib_cflags= + + # Linux ngx_lib_inc="#include <pcre.h>" ngx_lib="PCRE library" @@ -55,6 +58,7 @@ else CORE_SRCS="$CORE_SRCS $REGEX_SRCS" CORE_LIBS="$CORE_LIBS $ngx_libs" PCRE=YES + ngx_found=no else # FreeBSD PCRE port. diff --git a/auto/lib/zlib/conf b/auto/lib/zlib/conf index 9c2178fad..37c1fa7ef 100644 --- a/auto/lib/zlib/conf +++ b/auto/lib/zlib/conf @@ -35,8 +35,11 @@ if [ $ZLIB != NONE ]; then else if [ $PLATFORM != win32 ]; then - ngx_lib_inc="#include <zlib.h>" + # FreeBSD, Solaris, Linux + + ngx_lib_cflags= + ngx_lib_inc="#include <zlib.h>" ngx_lib="zlib library" ngx_lib_test="z_stream z; deflate(&z, Z_NO_FLUSH)" ngx_libs=-lz diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make index 240b6474b..d25642533 100644 --- a/auto/lib/zlib/make +++ b/auto/lib/zlib/make @@ -77,8 +77,11 @@ case $PLATFORM in done=YES ;; + NO) + ;; + *) - echo "$0: error: invalid --with-zlib=asm=$ZLIB_ASM option." + echo "$0: error: invalid --with-zlib-asm=$ZLIB_ASM option." echo "The valid values are \"pentium\" and \"pentiumpro\" only". echo |