[FFmpeg-cvslog] configure: switch the libzvbi check to pkg-config

Reino Wijnsma git at videolan.org
Sat Oct 14 02:28:47 EEST 2017


ffmpeg | branch: master | Reino Wijnsma <rwijnsma at xs4all.nl> | Fri Oct 13 19:52:27 2017 -0300| [458783315b8fb84e0a06346184b3cf62314c9e2e] | committer: James Almer

configure: switch the libzvbi check to pkg-config

The library has several dependencies that vary between systems.
Their pkg-config properly lists them all.

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=458783315b8fb84e0a06346184b3cf62314c9e2e
---

 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 1bb61112d4..15f7e379d4 100755
--- a/configure
+++ b/configure
@@ -6102,7 +6102,7 @@ enabled libxavs           && require libxavs "stdint.h xavs.h" xavs_encoder_enco
 enabled libxvid           && require libxvid xvid.h xvid_global -lxvidcore
 enabled libzimg           && require_pkg_config libzimg "zimg >= 2.3.0" zimg.h zimg_get_api_version
 enabled libzmq            && require_pkg_config libzmq libzmq zmq.h zmq_ctx_new
-enabled libzvbi           && require libzvbi libzvbi.h vbi_decoder_new -lzvbi &&
+enabled libzvbi           && require_pkg_config libzvbi zvbi-0.2 libzvbi.h vbi_decoder_new &&
                              { check_cpp_condition libzvbi.h "VBI_VERSION_MAJOR > 0 || VBI_VERSION_MINOR > 2 || VBI_VERSION_MINOR == 2 && VBI_VERSION_MICRO >= 28" ||
                                enabled gpl || die "ERROR: libzvbi requires version 0.2.28 or --enable-gpl."; }
 enabled libxml2           && require_pkg_config libxml2 libxml-2.0 libxml2/libxml/xmlversion.h xmlCheckVersion



More information about the ffmpeg-cvslog mailing list