xserver: Branch 'master'

[Adam Jackson]

 test/Makefile.am |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 3f8c2f94483bf0b96e129c97ef4950170a3f05b4
Author: Giuseppe Bilotta <giuseppe.bilotta at gmail.com>
Date:   Fri Jan 13 18:44:01 2017 +0100

    tests: Fix without-dtrace build
    
    Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta at gmail.com>
    Reviewed-by: Mihail Konev <k.mvc at ya.ru>
    Signed-off-by: Mihail Konev <k.mvc at ya.ru>

diff --git a/test/Makefile.am b/test/Makefile.am
index 729402f..e1b341c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -142,6 +142,10 @@ tests_LDADD += \
             $(top_builddir)/Xext/libXvidmode.la \
             @XORG_LIBS@
 
+if !SPECIAL_DTRACE_OBJECTS
+tests_LDADD += $(top_builddir)/os/libos.la
+endif
+
 BUILT_SOURCES = sdksyms.c
 CLEANFILES += sdksyms.c