mirror of
https://github.com/nginx/nginx.git
synced 2024-12-29 02:11:21 -06:00
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>
This commit is contained in:
parent
dbc205ab5a
commit
e2259f492f
@ -46,30 +46,30 @@ else
|
|||||||
|
|
||||||
if [ "$NGX_PLATFORM" != win32 ]; then
|
if [ "$NGX_PLATFORM" != win32 ]; then
|
||||||
|
|
||||||
MD5=NO
|
MD5=NO
|
||||||
|
|
||||||
# Solaris 8/9
|
# FreeBSD, Solaris 10
|
||||||
|
|
||||||
ngx_feature="rsaref md5 library"
|
ngx_feature="system md library"
|
||||||
ngx_feature_name=
|
ngx_feature_name=
|
||||||
ngx_feature_run=no
|
ngx_feature_run=no
|
||||||
ngx_feature_incs="#include <md5.h>"
|
ngx_feature_incs="#include <md5.h>"
|
||||||
ngx_feature_path=
|
ngx_feature_path=
|
||||||
ngx_feature_libs="-lmd5"
|
|
||||||
ngx_feature_test="MD5_CTX md5; MD5Init(&md5)"
|
|
||||||
. auto/feature
|
|
||||||
|
|
||||||
ngx_md5_lib="system md5"
|
|
||||||
|
|
||||||
if [ $ngx_found = no ]; then
|
|
||||||
|
|
||||||
# FreeBSD
|
|
||||||
|
|
||||||
ngx_feature="rsaref md library"
|
|
||||||
ngx_feature_libs="-lmd"
|
ngx_feature_libs="-lmd"
|
||||||
|
ngx_feature_test="MD5_CTX md5; MD5Init(&md5)"
|
||||||
. auto/feature
|
. auto/feature
|
||||||
|
|
||||||
ngx_md5_lib="system md"
|
ngx_md5_lib="system md"
|
||||||
|
|
||||||
|
if [ $ngx_found = no ]; then
|
||||||
|
|
||||||
|
# Solaris 8/9
|
||||||
|
|
||||||
|
ngx_feature="system md5 library"
|
||||||
|
ngx_feature_libs="-lmd5"
|
||||||
|
. auto/feature
|
||||||
|
|
||||||
|
ngx_md5_lib="system md5"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $ngx_found = no ]; then
|
if [ $ngx_found = no ]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user