[mutter] configure: Add explicit disable flags for native backend / wayland
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] configure: Add explicit disable flags for native backend / wayland
- Date: Mon, 29 Dec 2014 02:28:42 +0000 (UTC)
commit 41303101e558bd5c756fdc035259685cb71e48b1
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Sun Dec 28 18:24:47 2014 -0800
configure: Add explicit disable flags for native backend / wayland
So people can have dependable builds. This still keeps the default as
"auto", though.
configure.ac | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a3724d9..cee4b05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,22 +200,39 @@ AC_SUBST(XWAYLAND_PATH)
PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES)
-PKG_CHECK_MODULES(MUTTER_NATIVE_BACKEND, [clutter-egl-1.0 libdrm libsystemd libinput gudev-1.0 gbm >= 10.3],
[have_native_backend=yes], [have_native_backend=no])
-if test $have_native_backend = yes; then
- AC_DEFINE([HAVE_NATIVE_BACKEND],[1],[Define if you want to enable the native (KMS) backend based on
systemd])
-fi
-AM_CONDITIONAL([HAVE_NATIVE_BACKEND],[test $have_native_backend = yes])
-
-PKG_CHECK_MODULES(MUTTER_WAYLAND, [clutter-wayland-1.0 clutter-wayland-compositor-1.0 wayland-server >=
1.6.90], [have_wayland=yes], [have_wayland=no])
-if test $have_wayland = yes; then
- AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
- AS_IF([test $WAYLAND_SCANNER = "no"],
- AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension
protocols]))
- AC_SUBST([WAYLAND_SCANNER])
-
- AC_DEFINE([HAVE_WAYLAND],[1],[Define if you want to enable Wayland support])
-fi
-AM_CONDITIONAL([HAVE_WAYLAND],[test $have_wayland = yes])
+MUTTER_NATIVE_BACKEND_MODULES="clutter-egl-1.0 libdrm libsystemd libinput gudev-1.0 gbm >= 10.3"
+
+AC_ARG_ENABLE(native-backend,
+ AS_HELP_STRING([--disable-native-backend], [disable mutter native (KMS) backend]),,
+ enable_native_backend=auto
+)
+AS_IF([test "$enable_native_backend" = "yes"], [have_native_backend=yes],
+ [test "$enable_native_backend" = "auto"], PKG_CHECK_EXISTS([$MUTTER_NATIVE_BACKEND_MODULES],
[have_native_backend=yes]))
+
+AS_IF([test "$have_native_backend" = "yes"], [
+ PKG_CHECK_MODULES([MUTTER_NATIVE_BACKEND], [$MUTTER_NATIVE_BACKEND_MODULES])
+ AC_DEFINE([HAVE_NATIVE_BACKEND],[1], [Define if you want to enable the native (KMS) backend based on
systemd])
+])
+AM_CONDITIONAL([HAVE_NATIVE_BACKEND],[test "$have_native_backend" = "yes"])
+
+MUTTER_WAYLAND_MODULES="clutter-wayland-1.0 clutter-wayland-compositor-1.0 wayland-server >= 1.6.90"
+
+AC_ARG_ENABLE(wayland,
+ AS_HELP_STRING([--disable-wayland], [disable mutter on wayland support]),,
+ enable_wayland=auto
+)
+AS_IF([test "$enable_wayland" = "yes"], [have_wayland=yes],
+ [test "$enable_wayland" = "auto"], PKG_CHECK_EXISTS([$MUTTER_WAYLAND_MODULES], [have_wayland=yes]))
+
+AS_IF([test "$have_wayland" = "yes"], [
+ PKG_CHECK_MODULES([MUTTER_WAYLAND], [$MUTTER_WAYLAND_MODULES])
+ AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
+ AS_IF([test $WAYLAND_SCANNER = "no"],
+ [AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension
protocols])])
+ AC_SUBST([WAYLAND_SCANNER])
+ AC_DEFINE([HAVE_WAYLAND],[1],[Define if you want to enable Wayland support])
+])
+AM_CONDITIONAL([HAVE_WAYLAND],[test "$have_wayland" = "yes"])
PKG_CHECK_EXISTS([xi >= 1.6.99.1],
AC_DEFINE([HAVE_XI23],[1],[Define if you have support for XInput 2.3 or greater]))
@@ -416,6 +433,8 @@ mutter-$VERSION
libcanberra: ${have_libcanberra}
Introspection: ${found_introspection}
Session management: ${found_sm}
+ Wayland: ${have_wayland}
+ Native (KMS) backend: ${have_native_backend}
"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]