summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLaurent Carlier <lordheavym@gmail.com>2018-03-01 12:55:11 +0100
committerAdam Jackson <ajax@redhat.com>2018-03-02 12:05:42 -0500
commit238219e7312e2b5d972a8620b02379009686a005 (patch)
tree4fb335ec6be28ab2c7e783c2f6ece40744e16de9 /include
parent2af0a50a4bb9be9f58681d417ceb9a7029caaf3b (diff)
meson: Make APM support optional
v2: Define HAVE_APM in dix-config.h Signed-off-by: Laurent Carlier <lordheavym@gmail.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/meson.build3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/meson.build b/include/meson.build
index 83778c69b..45d27774a 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -198,6 +198,8 @@ conf_data.set('XvMCExtension', build_xvmc)
conf_data.set('HAVE_SHA1_IN_LIBNETTLE', '1') # XXX
+conf_data.set('HAVE_APM', build_apm or build_acpi)
+
enable_debugging = get_option('buildtype') == 'debug'
conf_data.set('DEBUG', enable_debugging)
@@ -255,6 +257,7 @@ xorg_data.set('XSERVER_LIBPCIACCESS', get_option('pciaccess'))
xorg_data.set_quoted('PCI_TXT_IDS_PATH', '')
xorg_data.set('XSERVER_PLATFORM_BUS', build_udev)
xorg_data.set('WSCONS_SUPPORT', host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd')
+xorg_data.set('XF86PM', build_apm)
if host_machine.system() == 'freebsd' or host_machine.system() == 'dragonflybsd'
if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64'