From b9f1f83e27580002de55cd7626b65441770542d8 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Sun, 24 May 2009 14:19:16 +0000 Subject: [PATCH] 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 --- auto/os/features | 22 ++++++++++++++++++++++ auto/unix | 22 ---------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/auto/os/features b/auto/os/features index 3a9e1e98d..ae0590e09 100644 --- a/auto/os/features +++ b/auto/os/features @@ -230,3 +230,25 @@ ngx_feature_libs= ngx_feature_test="struct statvfs fs; statvfs(NULL, &fs);" . auto/feature + + +ngx_feature="dlopen()" +ngx_feature_name= +ngx_feature_run=no +ngx_feature_incs="#include " +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 diff --git a/auto/unix b/auto/unix index bf6fc7fe7..399e54c2a 100755 --- a/auto/unix +++ b/auto/unix @@ -185,28 +185,6 @@ if [ $ngx_found != yes ]; then fi -ngx_feature="dlopen()" -ngx_feature_name= -ngx_feature_run=no -ngx_feature_incs="#include " -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_name="NGX_HAVE_MAP_ANON" ngx_feature_run=yes