[gnome-control-center/gnome-3-24] common: Check for wayland before building GsdUdevDeviceManager
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/gnome-3-24] common: Check for wayland before building GsdUdevDeviceManager
- Date: Tue, 16 Jan 2018 17:24:24 +0000 (UTC)
commit 103d814d2fb8019e45b5777f2908a809f68b24e8
Author: Carlos Garnacho <carlosg gnome org>
Date: Wed Jul 19 19:44:35 2017 +0200
common: Check for wayland before building GsdUdevDeviceManager
Udev is rather common, so this check doesn't suffice if anyone wants
to build with no wayland support whatsoever.
https://bugzilla.gnome.org/show_bug.cgi?id=780544
configure.ac | 1 +
panels/common/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index bfe6e07..b1c00d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -191,6 +191,7 @@ if test "x$have_wayland" = xyes ; then
AC_MSG_ERROR([udev is required for Wayland support])
fi
fi
+AM_CONDITIONAL(HAVE_WAYLAND, [test "x$have_wayland" = "xyes"])
# Panels that must be built on Linux systems
linux_error_or_warn()
diff --git a/panels/common/Makefile.am b/panels/common/Makefile.am
index 7d0eaad..be0e44a 100644
--- a/panels/common/Makefile.am
+++ b/panels/common/Makefile.am
@@ -62,7 +62,7 @@ libdevice_la_SOURCES = \
libdevice_la_LIBADD = \
$(DEVICES_LIBS)
-if HAVE_UDEV
+if HAVE_WAYLAND
AM_CPPFLAGS += $(UDEV_CFLAGS)
libdevice_la_LIBADD += $(UDEV_LIBS)
libdevice_la_SOURCES += \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]