[nautilus/134-xf86back-and-xf86forward-not-working-anymore] build: Detect X11/XF86keysym.h to enable extra keys Support for special keyboard keys for actions su



commit 78cb6c552d1e2c186e57fe13496a51cf1c8e6b21
Author: António Fernandes <antoniof gnome org>
Date:   Wed Nov 29 17:23:52 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 857a90c2).
    
    Restore this support by checking for this header with meson.
    Also, indent fix style.
    
    Fixes #134

 config.h.meson | 1 +
 meson.build    | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/config.h.meson b/config.h.meson
index 8014bb678..ad2817675 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 79702078e..f044059a8 100644
--- a/meson.build
+++ b/meson.build
@@ -78,7 +78,11 @@ endif
 
 tracker_sparql = dependency ('tracker-sparql-2.0', required: false)
 if not tracker_sparql.found()
-  tracker_sparql = dependency ('tracker-sparql-1.0')
+    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',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]