xf86-video-intel: configure.ac test/Makefile.am

Chris Wilson ickle at kemper.freedesktop.org
Sun Aug 17 23:30:34 PDT 2014


 configure.ac     |    1 +
 test/Makefile.am |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 9058dac3029b0e4f35eaa8ac101d38f3071f3c52
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Aug 18 07:23:27 2014 +0100

    test: Only compile lowlevel-blt-bench if we have shm
    
    Since 37ac34c4e4500bfc272222754949edc1dbb8c7e2, lowlevel-blt-bench
    requires SHM support, so only compile it if we detect such during
    configure.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/configure.ac b/configure.ac
index e40a965..797e224 100644
--- a/configure.ac
+++ b/configure.ac
@@ -250,6 +250,7 @@ fi
 
 PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"])
 AM_CONDITIONAL(X11_DRI3, test "x$x11_dri3" = "xyes" -a "x$shm" = "xyes")
+AM_CONDITIONAL(X11_SHM, test "x$shm" = "xyes")
 
 AC_ARG_ENABLE(tools,
               AS_HELP_STRING([--disable-tools],
diff --git a/test/Makefile.am b/test/Makefile.am
index f9906d4..be0b1f0 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -40,7 +40,10 @@ stress_TESTS += \
 endif
 check_PROGRAMS = $(stress_TESTS)
 
-noinst_PROGRAMS = lowlevel-blt-bench
+noinst_PROGRAMS =
+if X11_SHM
+noinst_PROGRAMS += lowlevel-blt-bench
+endif
 
 AM_CFLAGS = @CWARNFLAGS@ $(X11_CFLAGS) $(DRM_CFLAGS)
 LDADD = libtest.la $(X11_LIBS) $(DRM_LIBS) $(CLOCK_GETTIME_LIBS)


More information about the xorg-commit mailing list