[FFmpeg-cvslog] configure: require pkg-config for libvorbis

Ricardo Constantino git at videolan.org
Thu Jul 6 22:39:46 EEST 2017

ffmpeg | branch: master | Ricardo Constantino <wiiaboo at gmail.com> | Tue Jul  4 19:01:22 2017 +0100| [3b3501f75cb20b9f7abf43a3a9b1c3de595bc588] | committer: Derek Buitenhuis

configure: require pkg-config for libvorbis

libvorbis comes with pkg-config files since at least v1.0.1, way back in 2003.

We need the two checks for vorbis and vorbisenc because we use functions from
both and Xiph considers them separate libraries.

The check is inverted (vorbis first then vorbisenc) because add_extralibs()
prepends to EXTRALIBS instead of appending. For both shared and static linking
the order didn't seem to matter anyway, testing with MinGW.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b3501f75cb20b9f7abf43a3a9b1c3de595bc588

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

diff --git a/configure b/configure
index 282114d268..1c65b536d5 100755
--- a/configure
+++ b/configure
@@ -5902,7 +5902,8 @@ enabled libtwolame        && require libtwolame twolame.h twolame_init -ltwolame
 enabled libv4l2           && require_pkg_config libv4l2 libv4l2.h v4l2_ioctl
 enabled libvidstab        && require_pkg_config "vidstab >= 0.98" vid.stab/libvidstab.h vsMotionDetectInit
 enabled libvo_amrwbenc    && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init -lvo-amrwbenc
-enabled libvorbis         && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg
+enabled libvorbis         && require_pkg_config vorbis vorbis/codec.h vorbis_info_init &&
+                             require_pkg_config vorbisenc vorbis/vorbisenc.h vorbis_encode_init
 enabled libvpx            && {
     enabled libvpx_vp8_decoder && {

More information about the ffmpeg-cvslog mailing list