ffmpeg | branch: release/2.5 | Moritz Barsnick <barsn...@gmx.net> | Mon Dec 8 16:08:20 2014 +0100| [d5af3fb1c53e55654f409904a3491e77db02fa5a] | committer: Michael Niedermayer
configure: use use_pkg_config() instead of check_pkg_config() for libsmbclient This ensures that the CFLAGS and LDFLAGS are actually applied. Fixes an incorrect change introduced with the clean-up in commit cfcaf6b38e39ed6e788abb1a5a44f23660dce2f6. Reviewed-by: Nicolas George <geo...@nsup.org> Signed-off-by: Michael Niedermayer <michae...@gmx.at> (cherry picked from commit 754f4957d7a7e5be0df0e9de1d31aebeecdc4476) Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5af3fb1c53e55654f409904a3491e77db02fa5a --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index c046e34..ed50628 100755 --- a/configure +++ b/configure @@ -4883,7 +4883,7 @@ enabled libquvi && require_pkg_config libquvi quvi/quvi.h quvi_init enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket enabled libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init enabled libshine && require_pkg_config shine shine/layer3.h shine_encode_buffer -enabled libsmbclient && { check_pkg_config smbclient libsmbclient.h smbc_init || +enabled libsmbclient && { use_pkg_config smbclient libsmbclient.h smbc_init || require smbclient libsmbclient.h smbc_init -lsmbclient; } enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr enabled libssh && require_pkg_config libssh libssh/sftp.h sftp_init _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
