[vlc-devel] [PATCH] configure: vorbis is not mandatory

[Rafaël Carré]

Hi,

On 04/09/14 06:25, Ming Hu wrote:
> ---
>  configure.ac | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 3d1b67a..4ef6f89 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -2000,9 +2000,11 @@ dnl
>  dnl  ogg demux plugin
>  dnl
>  PKG_ENABLE_MODULES_VLC([OGG], [], [ogg >= 1.0], [Ogg demux support], [auto])
> -PKG_CHECK_MODULES(LIBVORBIS, [vorbis >= 1.1], [
> -    AC_DEFINE(HAVE_LIBVORBIS, 1, [Define to 1 if you have the libvorbis])
> -],[])

What is wrong with this currently?

Its only action is to define HAVE_LIBVORBIS if vorbis exists, so configure
should not fail if vorbis is not found.

> +if test "x${enable_ogg}" = "xyes"; then
> +    PKG_CHECK_MODULES(LIBVORBIS, [vorbis >= 1.1], [
> +        AC_DEFINE(HAVE_LIBVORBIS, 1, [Define to 1 if you have the libvorbis])
> +    ],[])
> +fi
>  PKG_ENABLE_MODULES_VLC([OGG], [], [ogg >= 1.0], [Ogg demux support], [auto], [${LIBVORBIS_CFLAGS}], [${LIBVORBIS_LIBS}])
>  if test "${enable_sout}" != "no"; then
>      PKG_ENABLE_MODULES_VLC([MUX_OGG], [], [ogg >= 1.0], [Ogg mux support], [auto])
>