diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 19:30:08 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 19:30:08 +0000 |
| commit | bd7da0ae7b6b91b9a9b2ab5c67bf16d6d5bd28a7 (patch) | |
| tree | 4ffc0dd047de05f44a08a3edc87a0696465f2cd6 /configure | |
| parent | 0d733ec3794d6854377ad0be159d9c1475edae01 (diff) | |
| parent | 8fd361f53b3c17c1ae13a39e030c8fa3ab4d8f1f (diff) | |
| download | ffmpeg-bd7da0ae7b6b91b9a9b2ab5c67bf16d6d5bd28a7.tar.gz | |
Merge commit '8fd361f53b3c17c1ae13a39e030c8fa3ab4d8f1f'
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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"; } |