diff --git a/Makefile b/Makefile index 4d9e15460c127f5173bc81f254ef973979597c31..ea55233d7c749235fa06f14751760fc329a4d1fc 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 e8727dfbb1e24339d3a32165bd056fb0ec8c19aa..cf833cbd50417c7bf9db2c3b44a15d278ec0e53c 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 550b1576b64b4e353511bfb0725c62f743112786..41690374170f96f7ae8c6f2d36a2cca95c1f2c36 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)