[FFmpeg-devel] [FFmpeg-cvslog] Merge commit '7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63'

[Carl Eugen Hoyos]

2017-10-12 2:22 GMT+02:00 Michael Niedermayer <michael at niedermayer.cc>:
> On Wed, Oct 11, 2017 at 09:26:18PM +0000, James Almer wrote:
>> ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Oct 11 17:55:25 2017 -0300| [6dfcbd80ad446ff163b47f2bf432bbf706436ea8] | committer: James Almer
>>
>> Merge commit '7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63'
>>
>> * commit '7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63':
>>   build: Fine-grained link-time dependency settings
>>
>> Also included are bug fix commits 5ff3b5cafcc685b6936d16602b0f80aa09a95870,
>> d9da7151eef7fc469787e7298196cea291acfd82 and
>> 5e27ef800bfa2be17a6353ddedac6b7400e4624f.
>>
>> Merged-by: James Almer <jamrial at gmail.com>
>>
>> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6dfcbd80ad446ff163b47f2bf432bbf706436ea8
>> ---
>>
>>  Makefile                |   3 +-
>>  configure               | 297 +++++++++++++++++++++++++++++-------------------
>>  ffbuild/common.mak      |   2 +-
>>  ffbuild/library.mak     |   2 +-
>>  tests/checkasm/Makefile |   2 +-
>>  5 files changed, 187 insertions(+), 119 deletions(-)
>
> This breaks build here (linux x86-64)
>
> ./configure --enable-libxavs --enable-gpl

The commit broke aix, configure does not terminate now.

Carl Eugen