isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

configure: Add a minimum required version for the wayland package

Browse Source 
Previously Cogl would accept any version of Wayland when building the
Wayland backend. Seeing as there is now a stable API we might as well
specify that we require at least version 1.0.0. This is now also
mentioned in the README. This patch also changes it to use
PKG_CHECK_MODULES instead of PKG_CHECK_EXISTS because it does need to
abort if it fails and it shouldn't be checking it silently.

Reviewed-by: Robert Bragg <robert@linux.intel.com>

(cherry picked from commit d899955b714e5ed50c6c89b9fde4b341bcf80558)
This commit is contained in:
Neil Roberts 2013-03-20 16:36:58 +00:00
parent 5334547c00
commit 13675ab440
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.in
View File

@ -52,6 +52,9 @@ On X11, Cogl depends on the following extensions
• XExt • XExt
• XFixes ≥ @XFIXES_REQ_VERSION@ • XFixes ≥ @XFIXES_REQ_VERSION@
For the Wayland backend, Cogl requires:
• Wayland ≥ @WAYLAND_REQ_VERSION@
When running with OpenGL, Cogl requires at least version 1.3 When running with OpenGL, Cogl requires at least version 1.3
or 1.2 with the multitexturing extension. However to build Cogl or 1.2 with the multitexturing extension. However to build Cogl
you will need the latest GL headers which can be obtained from: you will need the latest GL headers which can be obtained from:

20
configure.ac
View File

@ -92,6 +92,7 @@ m4_define([xfixes_req_version], [3])
m4_define([xcomposite_req_version], [0.4]) m4_define([xcomposite_req_version], [0.4])
m4_define([xrandr_req_version], [1.2]) m4_define([xrandr_req_version], [1.2])
m4_define([cairo_req_version], [1.10]) m4_define([cairo_req_version], [1.10])
m4_define([wayland_req_version], [1.0.0])
dnl These variables get copied into the generated README dnl These variables get copied into the generated README
AC_SUBST([GLIB_REQ_VERSION], [glib_req_version]) AC_SUBST([GLIB_REQ_VERSION], [glib_req_version])
@ -103,6 +104,7 @@ AC_SUBST([XFIXES_REQ_VERSION], [xfixes_req_version])
AC_SUBST([GTK_DOC_REQ_VERSION], [gtk_doc_req_version]) AC_SUBST([GTK_DOC_REQ_VERSION], [gtk_doc_req_version])
AC_SUBST([GI_REQ_VERSION], [gi_req_version]) AC_SUBST([GI_REQ_VERSION], [gi_req_version])
AC_SUBST([UPROF_REQ_VERSION], [uprof_req_version]) AC_SUBST([UPROF_REQ_VERSION], [uprof_req_version])
AC_SUBST([WAYLAND_REQ_VERSION], [wayland_req_version])
# Save this value here, since automake will set cflags later and we # Save this value here, since automake will set cflags later and we
# want to know if the user specified custom cflags or not. # want to know if the user specified custom cflags or not.
@ -915,12 +917,10 @@ AS_IF([test "x$enable_wayland_egl_platform" = "xyes"],
NEED_EGL=yes NEED_EGL=yes
EGL_PLATFORMS="$EGL_PLATFORMS wayland" EGL_PLATFORMS="$EGL_PLATFORMS wayland"
PKG_CHECK_EXISTS([wayland-egl], PKG_CHECK_MODULES(WAYLAND_CLIENT,
[ [wayland-egl >= wayland_req_version wayland-client >= wayland_req_version])
COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES wayland-egl" COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES wayland-egl >= wayland_req_version"
COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES wayland-client" COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES wayland-client >= wayland_req_version"
],
[AC_MSG_ERROR([Unable to locate required wayland libraries])])
COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT" COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT"
]) ])
@ -971,11 +971,9 @@ AS_IF([test "x$enable_wayland_egl_server" = "xyes"],
[ [
NEED_EGL=yes NEED_EGL=yes
PKG_CHECK_EXISTS([wayland-server], PKG_CHECK_MODULES(WAYLAND_SERVER,
[ [wayland-server >= wayland_req_version])
COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES wayland-server" COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES wayland-server >= wayland_req_version"
],
[AC_MSG_ERROR([Unable to locate required wayland-server library])])
COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT" COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT"
]) ])