aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoritz Barsnick <barsnick@gmx.net>2014-12-08 16:08:20 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-09 01:04:32 +0100
commitd5af3fb1c53e55654f409904a3491e77db02fa5a (patch)
treefe56f8706f8d4c4fa294c3f224d5b2a429c4614b
parent6ec5a199ea7718d24d574b47176b224f6bdca6af (diff)
downloadffmpeg-d5af3fb1c53e55654f409904a3491e77db02fa5a.tar.gz
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 <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 754f4957d7a7e5be0df0e9de1d31aebeecdc4476) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index c046e3484d..ed506289d5 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