[Spice-devel] [PATCH v2 1/2] autotools: Add automake conditional for gstreamer

[Christophe Fergeau]

On Wed, Jan 18, 2017 at 03:29:45PM +0200, Snir Sheriber wrote:
> Adding conditional for having gstreamer_0_10 or gstreamer_1_0
> (and also a preprocessor symbol), removing the previous conditionals
> and update relevant ifdefs with the newly defined changes
> ---
>  configure.ac                       | 7 +++++--
>  server/Makefile.am                 | 8 +-------
>  server/reds.c                      | 4 ++--
>  server/tests/test-codecs-parsing.c | 4 ++--
>  server/video-encoder.h             | 2 +-
>  5 files changed, 11 insertions(+), 14 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index a78b4ec..499cd81 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -85,7 +85,6 @@ if test "x$enable_gstreamer" != "xno" && test "x$enable_gstreamer" != "x0.10"; t
>            fi
>      ])
>  fi
> -AM_CONDITIONAL(HAVE_GSTREAMER_1_0, test "x$have_gstreamer_1_0" = "xyes")
>  
>  if test "x$enable_gstreamer" != "xno" && test "x$enable_gstreamer" != "x1.0"; then
>      SPICE_CHECK_GSTREAMER(GSTREAMER_0_10, 0.10, [gstreamer-0.10 gstreamer-base-0.10 gstreamer-app-0.10 gstreamer-video-0.10],
> @@ -100,7 +99,11 @@ if test "x$enable_gstreamer" != "xno" && test "x$enable_gstreamer" != "x1.0"; th
>           fi
>      ])
>  fi
> -AM_CONDITIONAL(HAVE_GSTREAMER_0_10, test "x$have_gstreamer_0_10" = "xyes")
> +AS_IF([test "x$have_gstreamer_0_10" = "xyes" || test "x$have_gstreamer_1_0" = "xyes"],
> +      [AC_DEFINE([HAVE_GSTREAMER], [1], [Define if supporting GStreamer 0.10 or 1.0])
> +      AM_CONDITIONAL(HAVE_GSTREAMER, true)], [
> +      AM_CONDITIONAL(HAVE_GSTREAMER, false)
> +])
>  

Given that we need to keep the HAVE_GSTREAMER_0_10/HAVE_GSTREAMER_1_0
#define, I would not add a 3rd one combining the first two.

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20170118/56125aa4/attachment.sig>