[vlc-devel] commit: Simplify vcdx configure.ac logic. (Daniel Mierswa )

[Alexis Ballier]

On Sat, 23 Jan 2010 11:07:48 +0100 (CET)
git at videolan.org (git version control) wrote:

> vlc | branch: master | Daniel Mierswa <impulze at impulze.org> | Fri Jan
> 22 00:25:07 2010 +0100| [c8631c65127e95626aac7fc5106b52805b6096be] |
> committer: Rémi Denis-Courmont 
> 
> Simplify vcdx configure.ac logic.
> 
> HAVE_{LIBCDIO,LIBVCDINFO} and have_{libcdio,libvcdinfo} were nowhere
> used in the source except when --enable-vcdx was given, hence only
> probe for them when vcdx is to be enabled.
> Since have_libvcdinfo (which is a requirement for vcdx) can only be
> enabled if have_libcdio was defined, I simply put it in the
> enable_vcdx block. And because vcdx needs to be explicitly enabled,
> we can safely AC_MSG_ERROR on every missing library.
> 
> Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
[...]
> -  if test "$have_libvcdinfo" = "yes"
> -  then
> -    AC_DEFINE(HAVE_VCDX, 1,
> -    [Define for the VCD plugin using libcdio/libvcdinfo])
[...]
> -    VLC_ADD_PLUGIN([vcdx])
[...]
> +	PKG_CHECK_MODULES(LIBCDIO, [libcdio >= 0.78.2 libiso9660 >=
> 0.72],
> +	  [VLC_ADD_LIBS([vcdx],[$LIBCDIO_LIBS])
> +		 VLC_ADD_CFLAGS([vcdx],[$LIBCDIO_CFLAGS])],
> +		[AC_MSG_ERROR([vcdx plugin requires libcdio >=
> 0.78.2 and libiso9660 >= 0.72])])
> +	PKG_CHECK_MODULES(LIBVCDINFO, libvcdinfo >= 0.7.22,
> +		[VLC_ADD_LIBS([vcdx],[$LIBVCDINFO_LIBS])
> +		 VLC_ADD_CFLAGS([vcdx],[$LIBVCDINFO_CFLAGS])],
> +	  [AC_MSG_ERROR([vcdx plugin requires libvcdinfo library >=
> 0.7.22])]) fi

This is missing the VLC_ADD_PLUGIN call and the HAVE_VCDX define (used
by other source files according to grep).


Alexis.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20100123/879368fa/attachment.sig>