diff options
Diffstat (limited to 'auto/lib')
| -rw-r--r-- | auto/lib/md5/conf | 12 | ||||
| -rw-r--r-- | auto/lib/md5/make | 2 | ||||
| -rw-r--r-- | auto/lib/openssl/conf | 5 | ||||
| -rw-r--r-- | auto/lib/openssl/make | 2 | ||||
| -rw-r--r-- | auto/lib/pcre/conf | 4 | ||||
| -rw-r--r-- | auto/lib/pcre/make | 2 | ||||
| -rw-r--r-- | auto/lib/zlib/conf | 4 | ||||
| -rw-r--r-- | auto/lib/zlib/make | 2 |
8 files changed, 16 insertions, 17 deletions
diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf index 27fd64127..812242352 100644 --- a/auto/lib/md5/conf +++ b/auto/lib/md5/conf @@ -7,7 +7,7 @@ if [ $MD5 != NONE ]; then if grep MD5_Init $MD5/md5.h >/dev/null; then # OpenSSL md5 OPENSSL_MD5=YES - have=HAVE_OPENSSL_MD5 . auto/have + have=NGX_HAVE_OPENSSL_MD5 . auto/have else # rsaref md5 OPENSSL_MD5=NO @@ -43,13 +43,13 @@ if [ $MD5 != NONE ]; then else - if [ $PLATFORM != win32 ]; then + if [ $NGX_PLATFORM != win32 ]; then MD5=NO # Solaris 8/9 ngx_feature="rsaref md5 library" - ngx_feature_name="rsaref_md5" + ngx_feature_name= ngx_feature_run=no ngx_feature_incs="#include <md5.h>" ngx_feature_libs="-lmd5" @@ -66,7 +66,7 @@ else # FreeBSD ngx_feature="rsaref md library" - ngx_feature_name="rsaref_md5" + ngx_feature_name= ngx_feature_run=no ngx_feature_incs="#include <md5.h>" ngx_feature_libs="-lmd" @@ -87,7 +87,7 @@ else # OpenSSL crypto library ngx_feature="OpenSSL md5 crypto library" - ngx_feature_name="OpenSSL_md5" + ngx_feature_name="NGX_OPENSSL_MD5" ngx_feature_run=no ngx_feature_incs="#include <openssl/md5.h>" ngx_feature_libs="-lcrypto" @@ -98,7 +98,7 @@ else if [ $ngx_found = yes ]; then - have=HAVE_OPENSSL_MD5_H . auto/have + have=NGX_HAVE_OPENSSL_MD5_H . auto/have CORE_LIBS="$CORE_LIBS $ngx_feature_libs" MD5=YES MD5_LIB=crypto diff --git a/auto/lib/md5/make b/auto/lib/md5/make index 5dfddfa23..b333d4dfe 100644 --- a/auto/lib/md5/make +++ b/auto/lib/md5/make @@ -25,7 +25,7 @@ esac done=NO -case $PLATFORM in +case $NGX_PLATFORM in win32) cp auto/lib/md5/$ngx_makefile $MD5 diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf index 8ef4f3af9..0a70f3321 100644 --- a/auto/lib/openssl/conf +++ b/auto/lib/openssl/conf @@ -18,11 +18,11 @@ if [ $OPENSSL != NONE ]; then else - if [ $PLATFORM != win32 ]; then + if [ $NGX_PLATFORM != win32 ]; then OPENSSL=NO ngx_feature="OpenSSL library" - ngx_feature_name="OpenSSL" + ngx_feature_name="NGX_OPENSSL" ngx_feature_run=no ngx_feature_incs="#include <openssl/ssl.h>" ngx_feature_libs="-lssl -lcrypto" @@ -30,7 +30,6 @@ else . auto/feature 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_feature_libs" diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make index 5e931cbbe..28ab00364 100644 --- a/auto/lib/openssl/make +++ b/auto/lib/openssl/make @@ -2,7 +2,7 @@ # Copyright (C) Igor Sysoev -case $PLATFORM in +case $NGX_PLATFORM in *) echo "$OPENSSL/libssl.a:" >> $MAKEFILE echo " cd $OPENSSL \\" >> $MAKEFILE diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf index cf26be27a..168acbaa2 100644 --- a/auto/lib/pcre/conf +++ b/auto/lib/pcre/conf @@ -42,14 +42,14 @@ if [ $PCRE != NONE ]; then else - if [ $PLATFORM != win32 ]; then + if [ $NGX_PLATFORM != win32 ]; then PCRE=NO # FreeBSD PCRE port requires --with-cc-opt="-I /usr/local/include" # --with-ld-opt="-L /usr/local/lib" ngx_feature="PCRE library" - ngx_feature_name="PCRE" + ngx_feature_name="NGX_PCRE" ngx_feature_run=no ngx_feature_incs="#include <pcre.h>" ngx_feature_libs="-lpcre" diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make index a60fedb2d..27d774bb5 100644 --- a/auto/lib/pcre/make +++ b/auto/lib/pcre/make @@ -22,7 +22,7 @@ case "$NGX_CC_NAME" in esac -case $PLATFORM in +case $NGX_PLATFORM in win32) cp auto/lib/pcre/patch.pcre.in $PCRE diff --git a/auto/lib/zlib/conf b/auto/lib/zlib/conf index 797a2d309..8edd3f371 100644 --- a/auto/lib/zlib/conf +++ b/auto/lib/zlib/conf @@ -37,13 +37,13 @@ if [ $ZLIB != NONE ]; then else - if [ $PLATFORM != win32 ]; then + if [ $NGX_PLATFORM != win32 ]; then ZLIB=NO # FreeBSD, Solaris, Linux ngx_feature="zlib library" - ngx_feature_name="zlib" + ngx_feature_name= ngx_feature_run=no ngx_feature_incs="#include <zlib.h>" ngx_feature_libs="-lz" diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make index 2e5ea8420..1884b5026 100644 --- a/auto/lib/zlib/make +++ b/auto/lib/zlib/make @@ -26,7 +26,7 @@ esac done=NO -case $PLATFORM in +case $NGX_PLATFORM in win32) cp auto/lib/zlib/$ngx_makefile $ZLIB |