xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/os-support/linux/Makefile.am |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 2bd631810d910975a5df55c0e76b02856d53688d
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Sep 13 16:11:23 2018 -0400

    automake: Fix Linux build with --disable-apm --disable-acpi
    
    Fixes: accd32a4 (xorg: Remove the XF86PM define.)
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am
index aa76a7b92..7d4cf4222 100644
--- a/hw/xfree86/os-support/linux/Makefile.am
+++ b/hw/xfree86/os-support/linux/Makefile.am
@@ -13,6 +13,12 @@ APM_SRCS = lnx_apm.c
 XORG_CFLAGS += -DHAVE_APM
 endif
 
+if !LNXAPM
+if !LNXACPI
+ACPI_SRCS = $(srcdir)/../shared/pm_noop.c
+endif
+endif
+
 if SYSTEMD_LOGIND
 LOGIND_SRCS = systemd-logind.c
 XORG_CFLAGS += $(DBUS_CFLAGS)