diff options
Diffstat (limited to 'auto/lib/md5')
| -rw-r--r-- | auto/lib/md5/conf | 51 | ||||
| -rw-r--r-- | auto/lib/md5/make | 4 |
2 files changed, 29 insertions, 26 deletions
diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf index 748bea450..623986f0f 100644 --- a/auto/lib/md5/conf +++ b/auto/lib/md5/conf @@ -15,14 +15,14 @@ if [ $MD5 != NONE ]; then CORE_INCS="$CORE_INCS $MD5" - case "$CC" in + case "$NGX_CC_NAME" in - cl | wcl386 | bcc32) + msvc | owc | bcc) LINK_DEPS="$LINK_DEPS $MD5/md5.lib" CORE_LIBS="$CORE_LIBS $MD5/md5.lib" ;; - *icc) + icc) LINK_DEPS="$LINK_DEPS $MD5/libmd5.a" # to allow -ipo optimization we link with the *.o but not library @@ -45,20 +45,19 @@ else if [ $PLATFORM != win32 ]; then MD5=NO - ngx_lib_cflags= # Solaris 8/9 - 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_feature="rsaref md5 library" + ngx_feature_name="rsaref_md5" + ngx_feature_run=no + ngx_feature_incs="#include <md5.h>" + ngx_feature_libs="-lmd5" + ngx_feature_test="MD5_CTX md5; MD5Init(&md5)" + . auto/feature if [ $ngx_found = yes ]; then - CORE_LIBS="$CORE_LIBS $ngx_libs" + CORE_LIBS="$CORE_LIBS $ngx_feature_libs" MD5=YES MD5_LIB=md5 ngx_found=no @@ -66,15 +65,18 @@ else else # FreeBSD - ngx_lib="rsaref md library" - ngx_lib_test="MD5_CTX md5; MD5Init(&md5)" - ngx_libs=-lmd - . auto/lib/test + ngx_feature="rsaref md library" + ngx_feature_name="rsaref_md5" + ngx_feature_run=no + ngx_feature_incs="#include <md5.h>" + ngx_feature_libs="-lmd" + ngx_feature_test="MD5_CTX md5; MD5Init(&md5)" + . auto/feature fi if [ $ngx_found = yes ]; then - CORE_LIBS="$CORE_LIBS $ngx_libs" + CORE_LIBS="$CORE_LIBS $ngx_feature_libs" MD5=YES MD5_LIB=md ngx_found=no @@ -84,19 +86,20 @@ else # 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 + ngx_feature="OpenSSL md5 crypto library" + ngx_feature_name="OpenSSL_md5" + ngx_feature_run=no + ngx_feature_incs="#include <openssl/md5.h>" + ngx_feature_libs="-lcrypto" + ngx_feature_test="MD5_CTX md5; MD5_Init(&md5)" + . auto/feature fi fi if [ $ngx_found = yes ]; then - have=HAVE_OPENSSL_MD5 . auto/have have=HAVE_OPENSSL_MD5_H . auto/have - CORE_LIBS="$CORE_LIBS $ngx_libs" + CORE_LIBS="$CORE_LIBS $ngx_feature_libs" MD5=YES MD5_LIB=crypto fi diff --git a/auto/lib/md5/make b/auto/lib/md5/make index f718e6c2c..6e2834e6d 100644 --- a/auto/lib/md5/make +++ b/auto/lib/md5/make @@ -25,7 +25,7 @@ esac case $PLATFORM in win32) - line=`echo $MD5/md5.lib: | sed -e "s/\//$DIRSEP/g"` + line=`echo $MD5/md5.lib: | sed -e "s/\//$ngx_regex_dirsep/g"` echo "$line" >> $MAKEFILE ;; @@ -42,7 +42,7 @@ done=NO case $PLATFORM in win32) - md5=`echo $MD5 | sed -e "s/\//$DIRSEP/g"` + md5=`echo $MD5 | sed -e "s/\//$ngx_regex_dirsep/g"` cp auto/lib/md5/$makefile $MD5 echo " cd $md5" >> $MAKEFILE |