Only build libwayland_test.a if building tests with wayland

diff --git a/Makefile.in b/Makefile.in
index 618ca25..72acd89 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -303,9 +303,11 @@ CHECK_LIBS = xbmc/filesystem/test/filesystemTest.a \
              xbmc/utils/test/utilsTest.a \
              xbmc/threads/test/threadTest.a \
              xbmc/interfaces/python/test/pythonSwigTest.a \
-             xbmc/windowing/tests/wayland/test_wayland.a \
              xbmc/test/xbmc-test.a
 
+ifeq (@USE_WAYLAND@,1)
+CHECK_LIBS += xbmc/windowing/tests/wayland/test_wayland.a
+
 ifeq (@USE_WAYLAND_TEST_EXTENSION@,1)
 WAYLAND_TEST_MODULE = xbmc/windowing/tests/wayland/xbmc-wayland-test-extension.so
 $(WAYLAND_TEST_MODULE): force
@@ -313,6 +315,7 @@ $(WAYLAND_TEST_MODULE): force
 CHECK_EXTENSIONS = $(WAYLAND_TEST_MODULE)
 CHECK_LIBADD=@WAYLAND_TEST_LIBS@
 endif
+endif
 
 CHECK_PROGRAMS = xbmc-test
 

diff --git a/configure.in b/configure.in
index 8fb51b8..edee4a2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2554,9 +2554,12 @@ OUTPUT_FILES="Makefile \
     xbmc/android/jni/Makefile \
     xbmc/utils/Makefile \
     xbmc/main/Makefile \
-    xbmc/windowing/tests/wayland/Makefile \
     project/cmake/xbmc-config.cmake"
 
+if $use_wayland = "yes"; then
+OUTPUT_FILES="$OUTPUT_FILES xbmc/windowing/tests/wayland/Makefile"
+fi
+
 if test "$use_skin_touched" = "yes"; then
 OUTPUT_FILES="$OUTPUT_FILES addons/skin.touched/media/Makefile"
 fi