On Tue, 19 Jan 2016, Luca Barbato wrote:
Module: libav
Branch: master
Commit: 8fd361f53b3c17c1ae13a39e030c8fa3ab4d8f1f
Author: Luca Barbato <[email protected]>
Committer: Luca Barbato <[email protected]>
Date: Fri Jan 15 18:09:48 2016 +0100
configure: Use pkg-config to check for openssl
---
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"; }
This breaks building with openssl for me - configuring with
--enable-nonfree --enable-openssl finds openssl, but doesn't add anything
to EXTRALIBS, and thus linking fails.
Note how the check_pkg_config function doesn't actually add anything to
cflags/extraflags, only require_pkg_config does it.
// Martin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
