mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

waylandsink: Only build if gtk-3.0 was built with wayland target

Browse source 
Check in configure if the gtk-3.0 has wayland support, and don't
build the waylandsink example if it doesn't.
This commit is contained in:
Jan Schmidt 2018-05-05 14:32:59 +00:00
parent 0dcd431c0e
commit 0b9517cc96
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -306,6 +306,7 @@ dnl *** set variables based on configure arguments ***
dnl GTK is optional and used in examples
HAVE_GTK3=NO
HAVE_GTK3_WAYLAND=""
if test "x$BUILD_EXAMPLES" = "xyes"; then
PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.4, HAVE_GTK3=yes, HAVE_GTK3=no)
if test "x$HAVE_GTK3" = "xyes"; then
@ -314,12 +315,15 @@ if test "x$BUILD_EXAMPLES" = "xyes"; then
AC_SUBST(GTK_VERSION)
GTK_PREFIX=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`
AC_SUBST(GTK_BASE_DIR)
GTK3_TARGETS=`$PKG_CONFIG --variable=targets gtk+-3.0`
case "$GTK3_TARGETS" in *wayland*) HAVE_GTK3_WAYLAND="1" ;; esac
fi
fi
AC_SUBST(GTK3_LIBS)
AC_SUBST(GTK3_CFLAGS)
AC_SUBST(HAVE_GTK3)
AM_CONDITIONAL(HAVE_GTK3, test "x$HAVE_GTK3" = "xyes")
AM_CONDITIONAL(HAVE_GTK3_WAYLAND, test "x$HAVE_GTK3_WAYLAND" = "x1")
dnl x11 is optional for librfb
HAVE_X11=NO

2
tests/examples/Makefile.am
View file

@ -31,7 +31,7 @@ AVSAMPLE_DIR=
endif
if USE_WAYLAND
if HAVE_GTK3
if HAVE_GTK3_WAYLAND
WAYLAND_DIR=waylandsink
else
WAYLAND_DIR=