On Tue, Oct 15, 2013 at 09:28:55AM -0500, Jeremy White wrote:
> Signed-off-by: Jeremy White <jwhite@xxxxxxxxxxxxxxx>
> ---
> configure.ac | 37 +++++++++++++++---
> gtk/channel-playback.c | 58 +++++++---------------------
> gtk/channel-record.c | 98 +++++++++++++++---------------------------------
> 3 files changed, 77 insertions(+), 116 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index c42066f..8953446 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -97,11 +97,22 @@ AC_SUBST(PIXMAN_CFLAGS)
> AC_SUBST(PIXMAN_LIBS)
> SPICE_GLIB_REQUIRES="${SPICE_GLIB_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_GLIB_REQUIRES="${SPICE_GLIB_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)
> + AC_SUBST(CELT051_CFLAGS)
> + AC_SUBST(CELT051_LIBS)
> + AC_SUBST(CELT051_LIBDIR)
> + SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRES} celt051 >= 0.5.1.1"
> +else
> + have_celt051=no
> +fi
> +
> +AM_CONDITIONAL([HAVE_CELT051], [test "x$have_celt051" = "xyes"])
> +AM_COND_IF([HAVE_CELT051], AC_DEFINE([HAVE_CELT051], 1, [Define if we have celt051 codec]))
>
> PKG_CHECK_MODULES(SSL, openssl)
> AC_SUBST(SSL_CFLAGS)
> @@ -264,6 +275,22 @@ PKG_CHECK_MODULES(GTHREAD, gthread-2.0 > 2.0.0)
> AC_SUBST(GTHREAD_CFLAGS)
> AC_SUBST(GTHREAD_LIBS)
>
> +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, have_celt051=yes, have_celt051=no)
> + AC_SUBST(CELT051_CFLAGS)
> + AC_SUBST(CELT051_LIBS)
> + AC_SUBST(CELT051_LIBDIR)
> +else
> + have_celt051=no
> +fi
> +
> +AM_CONDITIONAL([HAVE_CELT051], [test "x$have_celt051" = "xyes"])
> +AM_COND_IF([HAVE_CELT051], AC_DEFINE([HAVE_CELT051], 1, [Define if we have celt051 codec]))
> +
> AC_ARG_WITH([audio],
> AS_HELP_STRING([--with-audio=@<:@gstreamer/pulse/auto/no@:>@], [Select audio backend @<:@default=auto@:>@]),
> [],
Same comment as in the previous patch, I'm not sure we need this in
configure.ac as common/configure.ac is now doing that for us.
Looks good apart from this.
Christophe
Attachment:
pgpsO5y_TkTFU.pgp
Description: PGP signature
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel