summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2014-09-10 15:41:08 -0700
committerKeith Packard <keithp@keithp.com>2014-09-18 15:29:15 -0700
commit9e07f3a3d28b01402beecb3280c94fc525bd8075 (patch)
treefdf1ed9c27c786fca12277934e5d452c27a582ff
parent670ee0757febfb965d718fce2d5688717def667d (diff)
test: Only build hashtable tests if building X-Resource extension
The hash table functions are only included in the server when the X-Resource extension is built, so don't try to build and test them unless the X-Resource extension is being built. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--test/Makefile.am5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 32edc7a3b..83442767a 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -5,7 +5,10 @@ if XORG
# Tests that require at least some DDX functions in order to fully link
# For now, requires xf86 ddx, could be adjusted to use another
SUBDIRS += xi2
-noinst_PROGRAMS += xkb input xtest misc fixes xfree86 hashtabletest os signal-logging touch
+noinst_PROGRAMS += xkb input xtest misc fixes xfree86 os signal-logging touch
+if RES
+noinst_PROGRAMS += hashtabletest
+endif
endif
check_LTLIBRARIES = libxservertest.la