diff options
| author | sfan5 <sfan5@live.de> | 2017-12-19 18:45:27 +0100 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-12-19 15:12:24 -0300 |
| commit | b1781caf9e36edd4b84428c1e6aad8c4937c35d8 (patch) | |
| tree | 38fefc6ec4ebe8862406c3b4adadacfacff69da7 | |
| parent | b178278c7b4b494d21bbd0cc59bb6a0df2c5ffa9 (diff) | |
| download | ffmpeg-b1781caf9e36edd4b84428c1e6aad8c4937c35d8.tar.gz | |
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@live.de>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rwxr-xr-x | configure | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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"; } |