pxcloud/spice
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-08-12 19:05:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

autotools: Add automake conditional for gstreamer

Browse Source 
Adding conditional for having gstreamer_0_10 or gstreamer_1_0,
removing the previous conditionals and update relevant ifdefs
with the newly defined conditional
This commit is contained in:
Snir Sheriber 2017-01-19 16:29:18 +02:00 committed by Christophe Fergeau
parent 3066ebe33b
commit c9987b0fd5
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -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,7 @@ 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")
AM_CONDITIONAL(HAVE_GSTREAMER, test "x$have_gstreamer_0_10" = "xyes" || test "x$have_gstreamer_1_0" = "xyes")
AS_IF([test "x$enable_gstreamer" = "xyes"],
[AC_MSG_ERROR("GStreamer support requested but not found")],

8
server/Makefile.am
View File

@ -184,13 +184,7 @@ libserver_la_SOURCES += \
$(NULL)
endif
if HAVE_GSTREAMER_0_10
libserver_la_SOURCES += \
gstreamer-encoder.c \
$(NULL)
endif
if HAVE_GSTREAMER_1_0
if HAVE_GSTREAMER
libserver_la_SOURCES += \
gstreamer-encoder.c \
$(NULL)