[FFmpeg-cvslog] configure: Allow linking to openssl
Martin Storsjö
git at videolan.org
Sun Nov 6 02:39:13 CET 2011
ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Thu Feb 3 00:37:20 2011 +0200| [a060866fd769dde9e8681b7fad1b24eb97d27e18] | committer: Martin Storsjö
configure: Allow linking to openssl
Signed-off-by: Martin Storsjö <martin at martin.st>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a060866fd769dde9e8681b7fad1b24eb97d27e18
---
configure | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/configure b/configure
index 8a9ca6c..1aa432e 100755
--- a/configure
+++ b/configure
@@ -190,6 +190,7 @@ External library support:
--enable-libxvid enable Xvid encoding via xvidcore,
native MPEG-4/Xvid encoder exists [no]
--enable-mlib enable Sun medialib [no]
+ --enable-openssl enable openssl [no]
--enable-zlib enable zlib [autodetect]
Advanced options (experts only):
@@ -960,6 +961,7 @@ CONFIG_LIST="
mpegaudiodsp
network
nonfree
+ openssl
pic
postproc
rdft
@@ -2572,6 +2574,7 @@ die_license_disabled gpl libxvid
die_license_disabled gpl x11grab
die_license_disabled nonfree libfaac
+die_license_disabled nonfree openssl
die_license_disabled version3 libopencore_amrnb
die_license_disabled version3 libopencore_amrwb
@@ -2917,6 +2920,10 @@ enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 &&
enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs
enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
enabled mlib && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib
+enabled openssl && { 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"; }
# libdc1394 check
if enabled libdc1394; then
@@ -3196,6 +3203,7 @@ echo "libvpx enabled ${libvpx-no}"
echo "libx264 enabled ${libx264-no}"
echo "libxavs enabled ${libxavs-no}"
echo "libxvid enabled ${libxvid-no}"
+echo "openssl enabled ${openssl-no}"
echo "zlib enabled ${zlib-no}"
echo "bzlib enabled ${bzlib-no}"
echo
More information about the ffmpeg-cvslog
mailing list