[5137] Makefile is now ready for shell being disabled

diff --git a/src/bin/shell/tests/Makefile.am b/src/bin/shell/tests/Makefile.am
index 39d32022b195d47ca511bff19df37a99dba64fc6..a0c04ba1bb7dd4547bf9597c9cf810d7f7ba7d91 100644 (file)
--- a/src/bin/shell/tests/Makefile.am
+++ b/src/bin/shell/tests/Makefile.am
@@ -1,9 +1,13 @@
-PYTESTS = shell_unittest.py
+PYTESTS =
+SHTESTS =
+EXTRA_DIST =
 
-SHTESTS = shell_process_tests.sh
+if KEA_SHELL
 
-noinst_SCRIPTS = $(PYTESTS) shell_process_tests.sh
-EXTRA_DIST = testdata/plugins/testplugin.py
+# Ok, shell is enabled. Let's run those tests.
+PYTESTS += shell_unittest.py
+SHTESTS += shell_process_tests.sh
+noinst_SCRIPTS = $(PYTESTS) $(SHTESTS)
 
 # test using command-line arguments, so use check-local target instead of TESTS
 check-local: check-shell check-python
@@ -23,6 +27,15 @@ check-shell:
        ${SHELL} $(abs_builddir)/$$shtest || exit ; \
        done
 
+else
+
+# Nope, shell is disabled. Let's keep the files in EXTRA_DIST, so they get
+# included in make dist, but don't do anything special about them.
+EXTRA_DIST += shell_unittest.py shell_process_tests.sh
+
+endif
+
+
 CLEANDIRS = __pycache__
 
 clean-local: