# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1546976480 -3600
# Node ID e9da936309df3eb96cccf643e8d7f70a4585fffc
# Parent  06cc2f95f479c7e169894a58ef963fc9c2abcdb2
irccd: fix build without Javascript

diff -r 06cc2f95f479 -r e9da936309df cmake/function/IrccdDefinePlugin.cmake
--- a/cmake/function/IrccdDefinePlugin.cmake	Tue Jan 08 20:41:20 2019 +0100
+++ b/cmake/function/IrccdDefinePlugin.cmake	Tue Jan 08 20:41:20 2019 +0100
@@ -136,6 +136,8 @@
 
 	if (NOT IRCCD_WITH_PLUGIN_${PLG_UPPER_NAME})
 		setg(IRCCD_WITH_PLUGIN_${PLG_UPPER_NAME}_MSG "No (disabled by user)")
+	elseif (NOT IRCCD_WITH_JS AND PLG_TYPE MATCHES "JS")
+		setg(IRCCD_WITH_PLUGIN_${PLG_UPPER_NAME}_MSG "No (Javascript disabled)")
 	else ()
 		setg(IRCCD_WITH_PLUGIN_${PLG_UPPER_NAME}_MSG "Yes")
 
diff -r 06cc2f95f479 -r e9da936309df irccd-test/main.cpp
--- a/irccd-test/main.cpp	Tue Jan 08 20:41:20 2019 +0100
+++ b/irccd-test/main.cpp	Tue Jan 08 20:41:20 2019 +0100
@@ -59,8 +59,9 @@
 using irccd::daemon::whois_event;
 using irccd::daemon::dynlib_plugin_loader;
 
-using irccd::js::plugin_loader;
-using irccd::js::api;
+#if defined(IRCCD_HAVE_JS)
+namespace js = irccd::js;
+#endif
 
 namespace irccd::test {
 
@@ -645,9 +646,9 @@
 	daemon->plugins().add_loader(std::make_unique<dynlib_plugin_loader>());
 
 #if defined(IRCCD_HAVE_JS)
-	auto loader = std::make_unique<plugin_loader>(*daemon);
+	auto loader = std::make_unique<js::plugin_loader>(*daemon);
 
-	for (const auto& f : api::registry())
+	for (const auto& f : js::api::registry())
 		loader->get_modules().push_back(f());
 
 	daemon->plugins().add_loader(std::move(loader));
diff -r 06cc2f95f479 -r e9da936309df plugins/CMakeLists.txt
--- a/plugins/CMakeLists.txt	Tue Jan 08 20:41:20 2019 +0100
+++ b/plugins/CMakeLists.txt	Tue Jan 08 20:41:20 2019 +0100
@@ -33,16 +33,13 @@
 	CACHE INTERNAL "All plugins"
 )
 
-if (IRCCD_HAVE_JS)
-	add_subdirectory(ask)
-	add_subdirectory(auth)
-	add_subdirectory(hangman)
-	add_subdirectory(history)
-	add_subdirectory(joke)
-	add_subdirectory(logger)
-	add_subdirectory(plugin)
-	add_subdirectory(roulette)
-	add_subdirectory(tictactoe)
-endif ()
-
+add_subdirectory(ask)
+add_subdirectory(auth)
+add_subdirectory(hangman)
+add_subdirectory(history)
+add_subdirectory(joke)
 add_subdirectory(links)
+add_subdirectory(logger)
+add_subdirectory(plugin)
+add_subdirectory(roulette)
+add_subdirectory(tictactoe)