From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Wed, 14 Oct 2015 17:06:02 +0000 (+0200)
Subject: build: PUC-Rio Lua now deprecated, LuaJIT mandatory for daemon
X-Git-Tag: v1.0.0-beta2~83
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c7b002c039879dddc009e81ebf1846ac3cbea45;p=thirdparty%2Fknot-resolver.git

build: PUC-Rio Lua now deprecated, LuaJIT mandatory for daemon
---

diff --git a/Makefile b/Makefile
index 4d9e15460..ea55233d7 100644
--- a/Makefile
+++ b/Makefile
@@ -18,9 +18,6 @@ endif
 $(eval $(call find_lib,libknot))
 $(eval $(call find_lib,libuv))
 $(eval $(call find_alt,lua,luajit))
-$(eval $(call find_alt,lua,lua5.2))
-$(eval $(call find_alt,lua,lua-5.2))
-$(eval $(call find_alt,lua,lua))
 $(eval $(call find_lib,cmocka))
 $(eval $(call find_bin,doxygen))
 $(eval $(call find_bin,sphinx-build))
diff --git a/doc/build.rst b/doc/build.rst
index e8727dfbb..cf833cbd5 100644
--- a/doc/build.rst
+++ b/doc/build.rst
@@ -31,7 +31,7 @@ The following is a list of software required to build Knot DNS Resolver from sou
    "`pkg-config`_", "*all*", "*(build only)* [#]_"
    "C compiler", "*all*", "*(build only)* [#]_"
    "libknot_ 2.0+", "*all*", "Knot DNS library (requires autotools, GnuTLS and Jansson)."
-   "LuaJIT_ 2.0+", "``daemon``", "Embedded scripting language (Lua_ 5.1+ with limitations)."
+   "LuaJIT_ 2.0+", "``daemon``", "Embedded scripting language."
    "libuv_ 1.7+", "``daemon``", "Multiplatform I/O and services (libuv_ 1.0 with limitations [#]_)."
 
 There are also *optional* packages that enable specific functionality in Knot DNS Resolver, they are useful mainly for developers to build documentation and tests.
diff --git a/help.mk b/help.mk
index 550b1576b..416903741 100644
--- a/help.mk
+++ b/help.mk
@@ -12,7 +12,7 @@ info:
 	$(info Dependencies)
 	$(info ------------)
 	$(info [$(HAS_libknot)] libknot (lib))
-	$(info [$(HAS_lua)] lua (daemon))
+	$(info [$(HAS_lua)] LuaJIT (daemon))
 	$(info [$(HAS_libuv)] libuv (daemon))
 	$(info )
 	$(info Optional)