[FFmpeg-devel] [PATCH 1/2] configure: add pkg-config detection for twolame

[Carl Eugen Hoyos]

2017-11-29 21:57 GMT+01:00 Hendrik Leppkes <h.leppkes at gmail.com>:
> On Wed, Nov 29, 2017 at 9:39 PM, Stephen Hutchinson <qyot27 at gmail.com> wrote:
>> ---
>>  configure | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/configure b/configure
>> index 4e7254eaeb..3c08125da3 100755
>> --- a/configure
>> +++ b/configure
>> @@ -5888,7 +5888,9 @@ enabled libssh            && require_pkg_config libssh libssh libssh/sftp.h sftp
>>  enabled libspeex          && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
>>  enabled libtesseract      && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate
>>  enabled libtheora         && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
>> -enabled libtwolame        && require libtwolame twolame.h twolame_init -ltwolame &&
>> +enabled libtwolame        && { check_pkg_config libtwolame "twolame >= 0.3.10" twolame.h twolame_init ||
>> +                               require libtwolame twolame.h twolame_init -ltwolame &&
>> +                               warn "using libtwolame without pkg-config"; } &&
>>                               { check_lib libtwolame twolame.h twolame_encode_buffer_float32_interleaved -ltwolame ||
>
> If all supported versions of twolame have always had a pkg-config
> file, then just replace it with require_pkg_config without the
> fallback dance.

Please keep the non-pkg-config case to allow testing on a few
less common platforms.

Thank you, Carl Eugen