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

diff --git a/auto/os/features b/auto/os/features
index 3a9e1e98de810e4882152efefee5b666b2ae6601..ae0590e0980239e52a3e3f7ec639b83aee357224 100644 (file)
--- 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 <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

diff --git a/auto/unix b/auto/unix
index bf6fc7fe74e248787e046fe17ce735672f744f89..399e54c2a0eca05f7574f04081dddc4268eccbcc 100755 (executable)
--- 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 <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_name="NGX_HAVE_MAP_ANON"
 ngx_feature_run=yes