# HG changeset patch # User Igor Sysoev # Date 1241723890 0 # Node ID 304bfc6faf074f9eda32d4c6c2abd854c62c0997 # Parent 219aa0b0fd58a7de9d9944ce0aaaaf213db5dbf8 move libmd test before libmd5, this fixes wrong linking with /usr/local/lib/libmd5.so from libwww package on FreeBSD. The library uses long's instead of int32_t's in MD5_CTX and on 64-bit platforms its MD5_CTX is bigger than defined in diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf --- a/auto/lib/md5/conf +++ b/auto/lib/md5/conf @@ -46,30 +46,30 @@ else if [ "$NGX_PLATFORM" != win32 ]; then - MD5=NO + MD5=NO - # Solaris 8/9 + # FreeBSD, Solaris 10 - ngx_feature="rsaref md5 library" - ngx_feature_name= - ngx_feature_run=no - ngx_feature_incs="#include " - ngx_feature_path= - ngx_feature_libs="-lmd5" - ngx_feature_test="MD5_CTX md5; MD5Init(&md5)" - . auto/feature + ngx_feature="system md library" + ngx_feature_name= + ngx_feature_run=no + ngx_feature_incs="#include " + ngx_feature_path= + ngx_feature_libs="-lmd" + ngx_feature_test="MD5_CTX md5; MD5Init(&md5)" + . auto/feature - ngx_md5_lib="system md5" + ngx_md5_lib="system md" if [ $ngx_found = no ]; then - # FreeBSD + # Solaris 8/9 - ngx_feature="rsaref md library" - ngx_feature_libs="-lmd" + ngx_feature="system md5 library" + ngx_feature_libs="-lmd5" . auto/feature - ngx_md5_lib="system md" + ngx_md5_lib="system md5" fi if [ $ngx_found = no ]; then