diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-05-07 19:18:10 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-05-07 19:18:10 +0000 |
| commit | e2259f492f1f55313bdee51213d79419798477fd (patch) | |
| tree | df1f8923ad2ec5cb791e518a2ae3f7bc8e6361e7 | |
| parent | dbc205ab5a856b64f31306565f9eeb5bbc7bea46 (diff) | |
| download | nginx-e2259f492f1f55313bdee51213d79419798477fd.tar.gz nginx-e2259f492f1f55313bdee51213d79419798477fd.tar.bz2 | |
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 <md5.h>
| -rw-r--r-- | auto/lib/md5/conf | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf index 33f0c37b8..75dd1300e 100644 --- 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 <md5.h>" - 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 <md5.h>" + 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 |