[FFmpeg-devel] Configure Script change request to support libcdio on macOS

[James Almer]

On 9/17/2017 11:42 PM, 桃源老師 wrote:
> Hello, 
> 
>> 2017/09/17 午後11:58、桃源老師 <xanadu6291 at dream.jp>のメール:
>>
>> I have tried to use libcdio function with ffmpeg on macOS. Then I get an information from libcdio team.  That is ffmpeg configure script should read libcdio's pkgconfig file, libcdio.pc.
> 
> I attach my request as patch file.  Please review it.

> --- a/configure	2017-09-18 10:24:52.000000000 +0900
> +++ b/configure	2017-09-18 11:31:58.000000000 +0900
> @@ -6151,7 +6151,7 @@
>  
>  if enabled libcdio; then
>      check_lib libcdio "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio ||
> -    check_lib libcdio "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio ||
> +    require_pkg_config libcdio "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio && check_lib libcdio "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio ||

If check_lib will stay as a fallback then you should use use_pkg_config,
not require_pkg_config.
Maybe add one use_pkg_config for each potential header locations as
well, as with check_lib.

Also, don't use &&, use ||. The point is that if one fails the next is
tested, until die() is reached.

>      die "ERROR: No usable libcdio/cdparanoia found"
>  fi
>