mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-19 06:46:38 +00:00
configure: fix check for wayland
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:
parent
205a15e14b
commit
1cc573d02f
1 changed files with 2 additions and 19 deletions
21
configure.ac
21
configure.ac
|
@ -898,26 +898,9 @@ AG_GST_CHECK_FEATURE(DIRECTFB, [directfb], dfbvideosink , [
|
|||
dnl **** Wayland ****
|
||||
translit(dnm, m, l) AM_CONDITIONAL(USE_WAYLAND, true)
|
||||
AG_GST_CHECK_FEATURE(WAYLAND, [wayland sink], wayland , [
|
||||
PKG_CHECK_MODULES(WAYLAND, wayland-server >= 0.95.0 wayland-client >= 0.95.0, [
|
||||
AC_CHECK_HEADER(wayland-client.h, HAVE_WAYLAND_CLIENT="yes", HAVE_WAYLAND_CLIENT="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"
|
||||
PKG_CHECK_MODULES(WAYLAND, wayland-client >= 0.95.0, [
|
||||
HAVE_WAYLAND="yes" ], [ HAVE_WAYLAND="no"
|
||||
])
|
||||
WAYLAND_CFLAGS=""
|
||||
AC_SUBST(WAYLAND_CFLAGS)
|
||||
AC_SUBST(WAYLAND_LIBS)
|
||||
])
|
||||
|
||||
dnl **** Dirac ****
|
||||
|
|
Loading…
Reference in a new issue