On Tue, Nov 05, 2013 at 04:25:14PM -0600, Jeremy White wrote: > diff --git a/configure.ac b/configure.ac > index 882bf1b..b7f6140 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -230,11 +230,13 @@ AC_SUBST(PIXMAN_CFLAGS) > AC_SUBST(PIXMAN_LIBS) > SPICE_REQUIRES+=" pixman-1 >= 0.17.7" > > -PKG_CHECK_MODULES(CELT051, celt051 >= 0.5.1.1) > -AC_SUBST(CELT051_CFLAGS) > -AC_SUBST(CELT051_LIBS) > -AC_SUBST(CELT051_LIBDIR) > -SPICE_REQUIRES+=" celt051 >= 0.5.1.1" > +AC_ARG_ENABLE(celt051, > + [ --disable-celt051 Disable celt051 audio codec (enabled by default)],, > + [enable_celt051="yes"]) > + > +if test "x$enable_celt051" = "xyes"; then > + PKG_CHECK_MODULES(CELT051, celt051 >= 0.5.1.1, SPICE_REQUIRES+=" celt051 >= 0.5.1.1") > +fi For what it's worth, I still don't like that duplication, but I don't think we have much choice at the moment :-/ I've started experimenting with replacing the heavyweight AC_CONFIG_SUBDIRS(spice-common) with a m4 macro provided by spice-common which would do the needed checks directly from the toplevel configure.ac. The advantage of that is that the m4 macro would be able to fill a SPICE_COMMON_REQUIRES variable which we would then be able to reuse without duplicating the celt check. For now, that configure.ac addition should be enough. Christophe
Attachment:
pgp7MuJyNT00c.pgp
Description: PGP signature
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel