[cogl] build: only build cogland with wayland-server 0.85
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl] build: only build cogland with wayland-server 0.85
- Date: Mon, 21 Jan 2013 17:25:19 +0000 (UTC)
commit 819aba153bfc208ab931be1acca4bfa0635a8b58
Author: Robert Bragg <robert linux intel com>
Date: Fri Jan 4 17:21:22 2013 +0000
build: only build cogland with wayland-server 0.85
This ensures we only try to build cogland if we have wayland-server
0.85.x since the api is incompatible with later versions.
(cherry picked from commit ab0085596739eec4d762cb7c7531d0510ee076bd)
configure.ac | 15 ++++++++++++++-
examples/Makefile.am | 2 ++
2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4e19a62..9564d85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -959,11 +959,24 @@ AC_ARG_ENABLE(
AS_IF([test "x$enable_wayland_egl_server" = "xyes"],
[
NEED_EGL=yes
- COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES wayland-server"
+
+ PKG_CHECK_EXISTS([wayland-server],
+ [
+ COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES wayland-server"
+ ],
+ [AC_MSG_ERROR([Unable to locate required wayland-server library])])
+
+ WAYLAND_SERVER_VERSION=`$PKG_CONFIG --modversion gbm`
+ WAYLAND_SERVER_MAJOR=`echo $WAYLAND_SERVER_VERSION | cut -d'.' -f1`
+ WAYLAND_SERVER_MINOR=`echo $WAYLAND_SERVER_VERSION | cut -d'.' -f2`
+ WAYLAND_SERVER_MICRO=`echo $WAYLAND_SERVER_VERSION | cut -d'.' -f3`
+
COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT"
])
AM_CONDITIONAL(SUPPORT_WAYLAND_EGL_SERVER,
[test "x$enable_wayland_egl_server" = "xyes"])
+AM_CONDITIONAL(WAYLAND_0_85_X_SERVER,
+ [test "x$WAYLAND_SERVER_MAJOR" = "x1" -a "x$WAYLAND_SERVER_MINOR" = "x85"])
dnl Android EGL platform
AC_ARG_ENABLE(
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 21f3d29..847e404 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -57,10 +57,12 @@ cogl_x11_tfp_LDADD = $(common_ldadd)
endif
if SUPPORT_WAYLAND_EGL_SERVER
+if WAYLAND_0_85_X_SERVER
programs += cogland2
cogland2_SOURCES = cogland.c
cogland2_LDADD = $(common_ldadd)
endif
+endif
cogl_gles2_context_SOURCES = cogl-gles2-context.c
cogl_gles2_context_LDADD = $(common_ldadd)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]