[FFmpeg-cvslog] configure: fix pkg-config check for libtls
sfan5
git at videolan.org
Tue Dec 19 19:19:46 EET 2017
ffmpeg | branch: master | sfan5 <sfan5 at live.de> | Tue Dec 19 17:33:26 2017 +0100| [b178278c7b4b494d21bbd0cc59bb6a0df2c5ffa9] | committer: James Almer
configure: fix pkg-config check for libtls
This was not accounted for during merge and is required due to
the refactor in commit 93ccba96df6340249b0db227d5bc3297010797a4.
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=b178278c7b4b494d21bbd0cc59bb6a0df2c5ffa9
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index 2f7db05faa..c01f414f9a 100755
--- a/configure
+++ b/configure
@@ -5894,7 +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 && { use_pkg_config libtls libtls tls.h tls_configure ||
+enabled libtls && { check_pkg_config libtls libtls tls.h tls_configure ||
require libtls tls.h tls_configure -ltls; }
enabled libtwolame && require libtwolame twolame.h twolame_init -ltwolame &&
{ check_lib libtwolame twolame.h twolame_encode_buffer_float32_interleaved -ltwolame ||
More information about the ffmpeg-cvslog
mailing list