[FFmpeg-devel] [PATCH] configure: use use_pkg_config() instead of check_pkg_config() for libsmbclient (Was: [PATCH 1/2] configure: add optional pkg-config helper and use it.

[Michael Niedermayer]

On Mon, Dec 08, 2014 at 07:28:37PM +0100, Nicolas George wrote:
> L'octidi 18 frimaire, an CCXXIII, Moritz Barsnick a écrit :
> > This breaks building with "--enable-libsmbclient", as it "checks", but
> > no longer "uses".
> 
> You are absolutely right. My bad.
> 
> > >From 16d67f67b27caa3d6927d8d34d052ea3258fb052 Mon Sep 17 00:00:00 2001
> > From: Moritz Barsnick <barsnick at gmx.net>
> > Date: Mon, 8 Dec 2014 16:08:20 +0100
> > Subject: [PATCH] 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.
> > ---
> >  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
> 
> This looks completely valid, thanks a lot.

applied

thanks

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

DNS cache poisoning attacks, popular search engine, Google internet authority
dont be evil, please
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20141209/d80d62d7/attachment.asc>