[FFmpeg-cvslog] configure: Use pkg-config to check for openssl
Luca Barbato
git at videolan.org
Wed Jan 27 20:30:29 CET 2016
ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Fri Jan 15 18:09:48 2016 +0100| [8fd361f53b3c17c1ae13a39e030c8fa3ab4d8f1f] | committer: Luca Barbato
configure: Use pkg-config to check for openssl
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8fd361f53b3c17c1ae13a39e030c8fa3ab4d8f1f
---
configure | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 8518e69..d776d0e 100755
--- a/configure
+++ b/configure
@@ -4532,7 +4532,8 @@ enabled mmal && { check_lib interface/mmal/mmal.h mmal_port_connect
check_lib interface/mmal/mmal.h mmal_port_connect ; }
check_lib interface/mmal/mmal.h mmal_port_connect ; } ||
die "ERROR: mmal 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"; }
More information about the ffmpeg-cvslog
mailing list