From 8e293a5adbbc0e840cb4de9dc3971845fbfade12 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Sat, 23 Nov 2013 12:40:34 -0800 Subject: [PATCH] tests: Use TEST_CLIENT for test client modules We abused SIMPLE_CLIENT_LIBS before, but if you disable simple clients, the test suite fails to link. Use test client specific variables instead. https://bugs.freedesktop.org/show_bug.cgi?id=71530 --- configure.ac | 2 ++ tests/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 41ce9ad..3d966d7 100644 --- a/configure.ac +++ b/configure.ac @@ -266,6 +266,8 @@ AC_SUBST(JPEG_LIBS) PKG_CHECK_MODULES(CAIRO, [cairo]) +PKG_CHECK_MODULES(TEST_CLIENT, [wayland-client]) + AC_ARG_ENABLE(simple-clients, AS_HELP_STRING([--disable-simple-clients], [do not build the simple wl_shm clients]),, diff --git a/tests/Makefile.am b/tests/Makefile.am index c018db4..aaeb84d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -94,7 +94,7 @@ weston_test_client_src = \ wayland-test-protocol.c \ wayland-test-client-protocol.h weston_test_client_libs = \ - $(SIMPLE_CLIENT_LIBS) \ + $(TEST_CLIENT_LIBS) \ ../shared/libshared.la \ libshared-test.la -- 2.7.4