mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-21 15:56:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure: fix check for wayland

Browse source 
We only seem to need wayland-client. Also make work with
wayland being installed in a non-default prefix by not
overwriting/clearing WAYLAND_{CFLAGS,LIBS} for no reason
at all.
This commit is contained in:
Tim-Philipp Müller 2012-08-21 10:37:10 +01:00
parent 205a15e14b
commit 1cc573d02f
1 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
configure.ac
View file

@ -898,26 +898,9 @@ AG_GST_CHECK_FEATURE(DIRECTFB, [directfb], dfbvideosink , [
dnl **** Wayland **** dnl **** Wayland ****
translit(dnm, m, l) AM_CONDITIONAL(USE_WAYLAND, true) translit(dnm, m, l) AM_CONDITIONAL(USE_WAYLAND, true)
AG_GST_CHECK_FEATURE(WAYLAND, [wayland sink], wayland , [ AG_GST_CHECK_FEATURE(WAYLAND, [wayland sink], wayland , [
PKG_CHECK_MODULES(WAYLAND, wayland-server >= 0.95.0 wayland-client >= 0.95.0, [ PKG_CHECK_MODULES(WAYLAND, wayland-client >= 0.95.0, [
AC_CHECK_HEADER(wayland-client.h, HAVE_WAYLAND_CLIENT="yes", HAVE_WAYLAND_CLIENT="no") HAVE_WAYLAND="yes" ], [ HAVE_WAYLAND="no"
AC_CHECK_HEADER(wayland-client-protocol.h, HAVE_WAYLAND_CLIENT_PROTOCOL="yes", HAVE_WAYLAND_CLIENT_PROTOCOL="no")
if test "x$HAVE_WAYLAND_CLIENT" = "xno"; then
AC_MSG_RESULT(wayland-client.h could not be found.)
HAVE_WAYLAND="no"
elif test "x$HAVE_WAYLAND_CLIENT_PROTOCOL" = "xno"; then
AC_MSG_RESULT(wayland-client-protocol.h could not be found.)
HAVE_WAYLAND="no"
else
HAVE_WAYLAND="yes"
WAYLAND_LIBS="-lwayland-client"
fi
], [
AC_MSG_RESULT(no wayland.)
HAVE_WAYLAND="no"
]) ])
WAYLAND_CFLAGS=""
AC_SUBST(WAYLAND_CFLAGS)
AC_SUBST(WAYLAND_LIBS)
]) ])
dnl **** Dirac **** dnl **** Dirac ****