summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authormonsta <[email protected]>2017-02-01 11:50:21 +0300
committermonsta <[email protected]>2017-02-01 11:50:21 +0300
commit90daf672ae2eaea92767a485215ff2b487168200 (patch)
tree3a4b211956ea6f57b650d49ecd0e150621ebdc0b /configure.ac
parent862e9323ab67e149f0d2704b297218be13bfb037 (diff)
downloadmate-power-manager-90daf672ae2eaea92767a485215ff2b487168200.tar.bz2
mate-power-manager-90daf672ae2eaea92767a485215ff2b487168200.tar.xz
build: require xproto >= 7.0.15 and simplify some code
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac15
1 files changed, 2 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac
index 8bbf921..6012b1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,6 +129,7 @@ LIBNOTIFY_REQUIRED=0.7.0
CAIRO_REQUIRED=1.0.0
LIBPANEL_REQUIRED=1.17.0
XRANDR_REQUIRED=1.3.0
+XPROTO_REQUIRED=7.0.15
CANBERRA_REQUIRED=0.10
UPOWER_REQUIRED=0.9.5
@@ -154,25 +155,13 @@ PKG_CHECK_MODULES(GDK, [
PKG_CHECK_MODULES(X11, [
xrandr >= $XRANDR_REQUIRED
- x11 xext xproto])
+ x11 xext xproto >= XPROTO_REQUIRED])
PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED)
dnl ---------------------------------------------------------------------------
-dnl - Check XF86XK_Keys
-dnl ---------------------------------------------------------------------------
-PKG_CHECK_EXISTS(
- [xproto >= 7.0.14],
- [AC_DEFINE(HAVE_XF86XK_BATTERY, 1, [Define if XF86XK_Battery is available])])
-
-PKG_CHECK_EXISTS(
- [xproto >= 7.0.15],
- [AC_DEFINE(HAVE_XF86XK_SUSPEND, 1, [Define if XF86XK_Suspend is available])
- AC_DEFINE(HAVE_XF86XK_HIBERNATE, 1, [Define if XF86XK_Hibernate is available])])
-
-dnl ---------------------------------------------------------------------------
dnl - Make paths available for source files
dnl ---------------------------------------------------------------------------
AC_SUBST(SYSCONFDIR, $sysconfdir)