Merge commit '8fd361f53b3c17c1ae13a39e030c8fa3ab4d8f1f'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago · bd7da0ae7b
parent 0d733ec379 8fd361f53b
commit bd7da0ae7b
1 changed files with 2 additions and 1 deletions
--- a/3
+++ b/3
@ -5589,7 +5589,8 @@ enabled opengl            && { check_lib GL/glx.h glXGetProcAddress "-lGL" ||
                               check_lib2 ES2/gl.h glGetError "-isysroot=${sysroot} -Wl,-framework,OpenGLES" ||
                               die "ERROR: opengl not found."
                             }
-enabled openssl           && { check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto ||
+enabled openssl           && { check_pkg_config openssl openssl/ssl.h SSL_library_init ||
+                               check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto ||
                               check_lib openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
                               check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
                               die "ERROR: openssl not found"; }