diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-05-16 14:32:58 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-05-16 14:32:58 +0000 |
| commit | 76566f88d9984cc870aa6ccb4eca64ef43ff40d2 (patch) | |
| tree | 4e879d8abf83eea97d7eed56962e7452ab0e8aba /auto/lib/md5 | |
| parent | d1c01504147cf9bbec9a6fef527db6d58bb73545 (diff) | |
| download | nginx-76566f88d9984cc870aa6ccb4eca64ef43ff40d2.tar.gz nginx-76566f88d9984cc870aa6ccb4eca64ef43ff40d2.tar.bz2 | |
simplify library autoconfigure
Diffstat (limited to 'auto/lib/md5')
| -rw-r--r-- | auto/lib/md5/conf | 55 |
1 files changed, 22 insertions, 33 deletions
diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf index 0c80fd59c..e081e4953 100644 --- a/auto/lib/md5/conf +++ b/auto/lib/md5/conf @@ -45,6 +45,7 @@ if [ $MD5 != NONE ]; then else if [ "$NGX_PLATFORM" != win32 ]; then + MD5=NO # Solaris 8/9 @@ -58,55 +59,43 @@ else ngx_feature_test="MD5_CTX md5; MD5Init(&md5)" . auto/feature - if [ $ngx_found = yes ]; then - CORE_LIBS="$CORE_LIBS $ngx_feature_libs" - MD5=YES - MD5_LIB=md5 - ngx_found=no + ngx_md5_lib="system md5" + + if [ $ngx_found = no ]; then - else # FreeBSD ngx_feature="rsaref md library" - ngx_feature_name= - ngx_feature_run=no - ngx_feature_incs="#include <md5.h>" - ngx_feature_path= ngx_feature_libs="-lmd" - ngx_feature_test="MD5_CTX md5; MD5Init(&md5)" . auto/feature + + ngx_md5_lib="system md" fi + if [ $ngx_found = no ]; then - if [ $ngx_found = yes ]; then - CORE_LIBS="$CORE_LIBS $ngx_feature_libs" - MD5=YES - MD5_LIB=md - ngx_found=no - - else - if [ $MD5 = NO ]; then - - # OpenSSL crypto library - - ngx_feature="OpenSSL md5 crypto library" - ngx_feature_name="NGX_OPENSSL_MD5" - ngx_feature_run=no - ngx_feature_incs="#include <openssl/md5.h>" - ngx_feature_path= - ngx_feature_libs="-lcrypto" - ngx_feature_test="MD5_CTX md5; MD5_Init(&md5)" - . auto/feature + # OpenSSL crypto library + + ngx_feature="OpenSSL md5 crypto library" + ngx_feature_name="NGX_OPENSSL_MD5" + ngx_feature_incs="#include <openssl/md5.h>" + ngx_feature_libs="-lcrypto" + ngx_feature_test="MD5_CTX md5; MD5_Init(&md5)" + . auto/feature + + ngx_md5_lib="system crypto" + + if [ $ngx_found = yes ]; then + have=NGX_HAVE_OPENSSL_MD5_H . auto/have fi fi - if [ $ngx_found = yes ]; then - have=NGX_HAVE_OPENSSL_MD5_H . auto/have CORE_LIBS="$CORE_LIBS $ngx_feature_libs" MD5=YES - MD5_LIB=crypto + MD5_LIB=$ngx_md5_lib fi + fi fi |