test libdl before OpenSSL configuration

the bug has been introduced in r2818 and broke
*) SSL modules linking on Solaris 9 and lower,
*) and linking with OpenSSL built from sources on Linux
This commit is contained in:
Igor Sysoev 2009-05-24 14:19:16 +00:00
parent 082ce96023
commit 7741b350e9
2 changed files with 22 additions and 22 deletions

View File

@ -230,3 +230,25 @@ ngx_feature_libs=
ngx_feature_test="struct statvfs fs; ngx_feature_test="struct statvfs fs;
statvfs(NULL, &fs);" statvfs(NULL, &fs);"
. auto/feature . auto/feature
ngx_feature="dlopen()"
ngx_feature_name=
ngx_feature_run=no
ngx_feature_incs="#include <dlfcn.h>"
ngx_feature_path=
ngx_feature_libs=
ngx_feature_test="dlopen(NULL, 0)"
. auto/feature
if [ $ngx_found != yes ]; then
ngx_feature="dlopen() in libdl"
ngx_feature_libs="-ldl"
. auto/feature
if [ $ngx_found = yes ]; then
NGX_LIBDL="-ldl"
fi
fi

View File

@ -185,28 +185,6 @@ if [ $ngx_found != yes ]; then
fi fi
ngx_feature="dlopen()"
ngx_feature_name=
ngx_feature_run=no
ngx_feature_incs="#include <dlfcn.h>"
ngx_feature_path=
ngx_feature_libs=
ngx_feature_test="dlopen(NULL, 0)"
. auto/feature
if [ $ngx_found != yes ]; then
ngx_feature="dlopen() in libdl"
ngx_feature_libs="-ldl"
. auto/feature
if [ $ngx_found = yes ]; then
NGX_LIBDL="-ldl"
fi
fi
ngx_feature="mmap(MAP_ANON|MAP_SHARED)" ngx_feature="mmap(MAP_ANON|MAP_SHARED)"
ngx_feature_name="NGX_HAVE_MAP_ANON" ngx_feature_name="NGX_HAVE_MAP_ANON"
ngx_feature_run=yes ngx_feature_run=yes