[FFmpeg-cvslog] configure: Correctly add openssl cflags and libs

Luca Barbato git at videolan.org
Wed Feb 3 17:58:06 CET 2016


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Fri Jan 22 11:33:50 2016 +0100| [c0c4d7a0a556ec66e3068d36a883e84d1efb0690] | committer: Luca Barbato

configure: Correctly add openssl cflags and libs

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0c4d7a0a556ec66e3068d36a883e84d1efb0690
---

 configure |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 1bfd3e9..c5bcb78 100755
--- a/configure
+++ b/configure
@@ -4582,7 +4582,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_pkg_config openssl openssl/ssl.h SSL_library_init ||
+enabled openssl           && { check_pkg_config openssl openssl/ssl.h SSL_library_init && {
+                               add_cflags $openssl_cflags && add_extralibs $openssl_libs; }||
                                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 ||



More information about the ffmpeg-cvslog mailing list