[nautilus/134-xf86back-and-xf86forward-not-working-anymore] build: Detect X11/XF86keysym.h to enable extra keys
- From: António Jorge Pinto Fernandes <antoniof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/134-xf86back-and-xf86forward-not-working-anymore] build: Detect X11/XF86keysym.h to enable extra keys
- Date: Wed, 29 Nov 2017 16:50:37 +0000 (UTC)
commit 5f95af99e1d294cf5e30910ce17dd013f3471641
Author: António Fernandes <antoniof gnome org>
Date: Wed Nov 29 16:31:04 2017 +0000
build: Detect X11/XF86keysym.h to enable extra keys
Support for special keyboard keys for actions such as Back,
Forward, Refresh, Go Home, etc. depends on this header.
We used to check for this header in configure.ac but
this was lost when porting from autotools to meson
(commit 857a90c29b6a91dcad4af4134fb1bc29a5897e31).
Restore this support by checking for this header with meson.
Fixes https://gitlab.gnome.org/GNOME/nautilus/issues/134
config.h.meson | 1 +
meson.build | 4 ++++
2 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/config.h.meson b/config.h.meson
index 8014bb6..ad28176 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -3,6 +3,7 @@
#mesondefine GETTEXT_PACKAGE
#mesondefine HAVE_EXEMPI
#mesondefine HAVE_SELINUX
+#mesondefine HAVE_X11_XF86KEYSYM_H
#mesondefine ENABLE_DESKTOP
#mesondefine ENABLE_PACKAGEKIT
#mesondefine LOCALEDIR
diff --git a/meson.build b/meson.build
index 7970207..6e04f1f 100644
--- a/meson.build
+++ b/meson.build
@@ -81,6 +81,10 @@ if not tracker_sparql.found()
tracker_sparql = dependency ('tracker-sparql-1.0')
endif
+if cc.has_header('X11/XF86keysym.h')
+ conf.set10 ('HAVE_X11_XF86KEYSYM_H', true)
+endif
+
configure_file (input: 'config.h.meson',
output: 'config.h',
configuration: conf)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]