[FFmpeg-cvslog] configure: remove libtls fallback check

sfan5 git at videolan.org
Tue Dec 19 20:13:35 EET 2017


ffmpeg | branch: master | sfan5 <sfan5 at live.de> | Tue Dec 19 18:45:27 2017 +0100| [b1781caf9e36edd4b84428c1e6aad8c4937c35d8] | committer: James Almer

configure: remove libtls fallback check

This check is not needed for any supported version of libtls
and causes issues with static builds (libtls links to -lssl -lcrypto).

Signed-off-by: sfan5 <sfan5 at live.de>
Signed-off-by: James Almer <jamrial at gmail.com>

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

 configure | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/configure b/configure
index c01f414f9a..1b07dc2ce7 100755
--- a/configure
+++ b/configure
@@ -5894,8 +5894,7 @@ enabled libssh            && require_pkg_config libssh libssh libssh/sftp.h sftp
 enabled libspeex          && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
 enabled libtesseract      && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate
 enabled libtheora         && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
-enabled libtls            && { check_pkg_config libtls libtls tls.h tls_configure ||
-                               require libtls tls.h tls_configure -ltls; }
+enabled libtls            && require_pkg_config libtls libtls tls.h tls_configure
 enabled libtwolame        && require libtwolame twolame.h twolame_init -ltwolame &&
                              { check_lib libtwolame twolame.h twolame_encode_buffer_float32_interleaved -ltwolame ||
                                die "ERROR: libtwolame must be installed and version must be >= 0.3.10"; }



More information about the ffmpeg-cvslog mailing list